Updated zprofile to contain /usr/local/bin in PATH. Thanks to Stephen Floor <snf@extrospective.net>. This closes bug #145383.

Package-Manager: portage-2.1.1-r1

10 files changed, 15 insertions, 654 deletions

diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index c2b37bed99fb..fce900b28509 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,10 +2,10 @@ AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
 RMD160 883f6a906300a4d8300145f722769db57c90ece2 files/prompt_gentoo_setup 1222
 SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667 files/prompt_gentoo_setup 1222
-AUX zprofile 403 RMD160 e0fb3dcacd3da70adc6eecb684c7066ef3493b5c SHA1 efb2412b17c149dc1f731fdbe55a820b9c66d503 SHA256 4b5809f1d62f47e931a161e25215d4ef97a04845e92c3f74e9daa9cc9615f56c
-MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
-RMD160 e0fb3dcacd3da70adc6eecb684c7066ef3493b5c files/zprofile 403
-SHA256 4b5809f1d62f47e931a161e25215d4ef97a04845e92c3f74e9daa9cc9615f56c files/zprofile 403
+AUX zprofile 449 RMD160 c2de38dbeac0f7fb0cdf07b4ddda57977a4d2c93 SHA1 2c49bc39493d459ceb66974805038298fcb3fe95 SHA256 f7334564399c128cd69fd08092eff9c3d50bca1d536cc9c6a60355c63a899590
+MD5 b12ee72532d1fe55bf9ca00a605b8609 files/zprofile 449
+RMD160 c2de38dbeac0f7fb0cdf07b4ddda57977a4d2c93 files/zprofile 449
+SHA256 f7334564399c128cd69fd08092eff9c3d50bca1d536cc9c6a60355c63a899590 files/zprofile 449
 AUX zsh-4.2.1-gentoo.diff 735 RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 SHA1 e5ef5ef72fa5953a6394c92d9e0fce13b28e33f7 SHA256 a8a236864616138a376aa5a2d0f9795604f7bf369d99f2fb82abb513482318f2
 MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
 RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 files/zsh-4.2.1-gentoo.diff 735
@@ -14,34 +14,17 @@ AUX zsh-init.d-gentoo.diff 1389 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a
 MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a files/zsh-init.d-gentoo.diff 1389
 SHA256 a8dcd168ab909a2b80b2958e3fc3cc974bc6048c08499be16c7925c1723b212f files/zsh-init.d-gentoo.diff 1389
-AUX zsh-strncmp.diff 354 RMD160 399b597c7cc525f9d50954718c7330a9a5224a5c SHA1 f9ce6ab58b8f2b778fb723a7bbfd8a99c30257be SHA256 b0bc29f18c81514cf279ce7bf4bfcd4625b8c8b958889a129387c09c00440b73
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-RMD160 399b597c7cc525f9d50954718c7330a9a5224a5c files/zsh-strncmp.diff 354
-SHA256 b0bc29f18c81514cf279ce7bf4bfcd4625b8c8b958889a129387c09c00440b73 files/zsh-strncmp.diff 354
 AUX zshenv 318 RMD160 dc38becda0ad8ea8931ba46c84ca337e0f503800 SHA1 787b68fadc7a5efd10bbfb3ae94a53bb7135a43c SHA256 609036567f335e35b6b638233cbcd11c2e2c60b18849cecac2e1e953f4aae323
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 RMD160 dc38becda0ad8ea8931ba46c84ca337e0f503800 files/zshenv 318
 SHA256 609036567f335e35b6b638233cbcd11c2e2c60b18849cecac2e1e953f4aae323 files/zshenv 318
-DIST zsh-4.0.9-doc.tar.bz2 1411985
-DIST zsh-4.0.9-euc-0.2.patch.gz 2869
-DIST zsh-4.0.9.tar.bz2 1749802
-DIST zsh-4.2.4-doc.tar.bz2 1766830
-DIST zsh-4.2.4-euc-0.3.patch.gz 2942
-DIST zsh-4.2.4.tar.bz2 2089657 RMD160 15102991181b4bf39dd6413f298388b6a8058ee4 SHA1 5bd2a12cc9b663ac0c6aed8a619930a233640d7e SHA256 a649ab9285e27c759dc2017a55cbe5b948b07743ebca62ccf8f7239d38bc4c0e
+DIST zsh-4.2.4-euc-0.3.patch.gz 2942 RMD160 82ce43a500f8ca8ca43e3a183b2cc30b4109f594 SHA1 64372caba7579f92075b60916cb9842fc8052774 SHA256 1044ddb4ca1e59fe4892b87115938026e85f7c52c2b87f3e5c5b074daeddce8d
 DIST zsh-4.2.5-doc.tar.bz2 1768286
 DIST zsh-4.2.5.tar.bz2 2074535 RMD160 10e2319b30d5791d39c0a4488e297d451adbdbe5 SHA1 4dc142eb37c4dadae29ed7fb51756ed89ba64263 SHA256 67d82adea4c002f49ca513db63d46a7b235baa358c384f9123e223a7db4bf8c4
 DIST zsh-4.2.6-doc.tar.bz2 1770113
 DIST zsh-4.2.6.tar.bz2 2098671 RMD160 e4400fc6311bf6996128ecf7899592d6d8cdb310 SHA1 e00c3eda3f52c9514bb625bb56e4480358170d39 SHA256 d5b9b93e8259d3059042e82d1738d623af6981c38c9f185b3949ea3dacbe6a61
 DIST zsh-4.3.2-doc.tar.bz2 2207375 RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff SHA1 1eee74b2f1f30428464b9a387b15d75e886e4b99 SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f
 DIST zsh-4.3.2.tar.bz2 2263544 RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e SHA1 a6dd50c7578812bdb30f4cb65c8ac280c86dbfc3 SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3
-EBUILD zsh-4.0.9-r4.ebuild 2889 RMD160 d2052c72a19befe6948021d807384ef30cbb9060 SHA1 8a1d7821158aea2edc58ff54ebcc878f523aeb4a SHA256 f6453426adf9c0e10b4f8249c07d4cfaee9597878b9c2182af25c6799cff7ff1
-MD5 d5f3557fedf35ebc49211049d7b3b641 zsh-4.0.9-r4.ebuild 2889
-RMD160 d2052c72a19befe6948021d807384ef30cbb9060 zsh-4.0.9-r4.ebuild 2889
-SHA256 f6453426adf9c0e10b4f8249c07d4cfaee9597878b9c2182af25c6799cff7ff1 zsh-4.0.9-r4.ebuild 2889
-EBUILD zsh-4.2.4.ebuild 4308 RMD160 9802357b34ceeaf7b542e8be4d62710a9f5905eb SHA1 fee594333ea7bce5038a58366c15df695f172ad1 SHA256 11b2bb6326ca5a8b5e5d23c2d1c54a7b6d42a1131dffc15b2bd7bba2f86b712b
-MD5 6759a1e89716a3959efa0101fac89c74 zsh-4.2.4.ebuild 4308
-RMD160 9802357b34ceeaf7b542e8be4d62710a9f5905eb zsh-4.2.4.ebuild 4308
-SHA256 11b2bb6326ca5a8b5e5d23c2d1c54a7b6d42a1131dffc15b2bd7bba2f86b712b zsh-4.2.4.ebuild 4308
 EBUILD zsh-4.2.5.ebuild 4550 RMD160 667aa17690dc93919b68332c605857f1c00c3012 SHA1 7f1d24cccba229ac4ef4a05d8539ae712e4da18f SHA256 aef066c01d539c8cefb70210281af85576d990f1ba78ef411c588f3695235b86
 MD5 ed4f462bf34c8e66ea0262db7dbfbaaf zsh-4.2.5.ebuild 4550
 RMD160 667aa17690dc93919b68332c605857f1c00c3012 zsh-4.2.5.ebuild 4550
@@ -50,44 +33,24 @@ EBUILD zsh-4.2.6-r1.ebuild 4348 RMD160 9adbbef79025021d89df5edfd810d2949404eddd
 MD5 4d4a547443a3128972ee302ebefe94de zsh-4.2.6-r1.ebuild 4348
 RMD160 9adbbef79025021d89df5edfd810d2949404eddd zsh-4.2.6-r1.ebuild 4348
 SHA256 8779988e3e4c53531d16250281e5eb5e6ada816c282be528e0888d11ba51522c zsh-4.2.6-r1.ebuild 4348
-EBUILD zsh-4.2.6.ebuild 4345 RMD160 b924e8d46f80006b31945dbd91203a656562a0ad SHA1 d3585c5c12f9dad7a099742ac70bb8dce08776da SHA256 06d3bb7847f2eab3d84ab86af3f5477255a496475e915f7d8559788f1e0e839d
-MD5 ed19d26dd8ca4268543fe404960dc870 zsh-4.2.6.ebuild 4345
-RMD160 b924e8d46f80006b31945dbd91203a656562a0ad zsh-4.2.6.ebuild 4345
-SHA256 06d3bb7847f2eab3d84ab86af3f5477255a496475e915f7d8559788f1e0e839d zsh-4.2.6.ebuild 4345
 EBUILD zsh-4.3.2-r1.ebuild 4309 RMD160 525d63bc9b5b043097c6b845aeaf0f4bd92e9a4f SHA1 f34a35cdb59880d0cb72bcb9c055bd9d4f2c5105 SHA256 634cbc144462931ad6db60d28638202eefd3685c85a080ba2975d549ae65a64d
 MD5 99f451837a4f59210bf7df1ad899cbb0 zsh-4.3.2-r1.ebuild 4309
 RMD160 525d63bc9b5b043097c6b845aeaf0f4bd92e9a4f zsh-4.3.2-r1.ebuild 4309
 SHA256 634cbc144462931ad6db60d28638202eefd3685c85a080ba2975d549ae65a64d zsh-4.3.2-r1.ebuild 4309
-EBUILD zsh-4.3.2.ebuild 4294 RMD160 dac0855ac90c61b41f85d99f0aa5a9f4199cbee7 SHA1 3968d22f4cff4048244cf6f6c2c6cab1bac53c47 SHA256 fe0196ed69367dc7d76c994cd663b5a2dae017b24a34e80ead8668dbb01d0426
-MD5 d1d3364411b986fc0bc9004838efd56b zsh-4.3.2.ebuild 4294
-RMD160 dac0855ac90c61b41f85d99f0aa5a9f4199cbee7 zsh-4.3.2.ebuild 4294
-SHA256 fe0196ed69367dc7d76c994cd663b5a2dae017b24a34e80ead8668dbb01d0426 zsh-4.3.2.ebuild 4294
-MISC ChangeLog 15368 RMD160 c338fed5a1e80054c6f31f9775f61b46ec853076 SHA1 3ad99122ffc08631090ddf3e78d6a7b5985712ca SHA256 67306579d802f84adcb6dadd160fff3d55f4c72ee5f120563abcfc1f250fc94a
-MD5 1ba71eadd832a558b29cfd1190b16297 ChangeLog 15368
-RMD160 c338fed5a1e80054c6f31f9775f61b46ec853076 ChangeLog 15368
-SHA256 67306579d802f84adcb6dadd160fff3d55f4c72ee5f120563abcfc1f250fc94a ChangeLog 15368
+MISC ChangeLog 15693 RMD160 62df3681c4e6e3fc44f1f8f843875cee7b4ae84b SHA1 308bb66e2495c012cc491ccfff80d2f0bf9acfec SHA256 8eabad97cdaf49d6d96974c27fe6e6433523b19a3e64dee02757042db0e88f0e
+MD5 af18aabda0c25c61ffa6884fe6766222 ChangeLog 15693
+RMD160 62df3681c4e6e3fc44f1f8f843875cee7b4ae84b ChangeLog 15693
+SHA256 8eabad97cdaf49d6d96974c27fe6e6433523b19a3e64dee02757042db0e88f0e ChangeLog 15693
 MISC metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 SHA1 ffc2013388ceb5abe378ec9668e33b692d568c45 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506
 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729 metadata.xml 506
-MD5 5a1c6f322578120f1cdfcbe935753641 files/digest-zsh-4.0.9-r4 199
-RMD160 5faf5876e174d222778464e4431097258e3c304a files/digest-zsh-4.0.9-r4 199
-SHA256 9d6d2c0330a9e6885633df87b9b658b5e37b2de968033877bb576ff3ee968bb9 files/digest-zsh-4.0.9-r4 199
-MD5 f1da7fba62ec81c2525a6a002f8a9378 files/digest-zsh-4.2.4 371
-RMD160 14f8cbcc4af812761277f086da02323a6d775683 files/digest-zsh-4.2.4 371
-SHA256 bb4a2a31090df454bfb6019a7d9019e7e1ea09666929ed5e7ecfef8d97ba7c23 files/digest-zsh-4.2.4 371
-MD5 9380f12668f1df0087e4d1e241b99383 files/digest-zsh-4.2.5 371
-RMD160 94df4950a034a782d039e1b8a0807376605a1af8 files/digest-zsh-4.2.5 371
-SHA256 d9db621ecf284ec5bf792cdbd8911b5bdc0049cc7c424b1593284daa22c86a3e files/digest-zsh-4.2.5 371
-MD5 98ec5627668a79231f518c0166869e19 files/digest-zsh-4.2.6 371
-RMD160 0f0512985ee72295343d52c76238fbaa1994b301 files/digest-zsh-4.2.6 371
-SHA256 07aefb3a936dd00ddf958094eb911213e8c4ddce52fd9a09b34de04f33d30124 files/digest-zsh-4.2.6 371
-MD5 98ec5627668a79231f518c0166869e19 files/digest-zsh-4.2.6-r1 371
-RMD160 0f0512985ee72295343d52c76238fbaa1994b301 files/digest-zsh-4.2.6-r1 371
-SHA256 07aefb3a936dd00ddf958094eb911213e8c4ddce52fd9a09b34de04f33d30124 files/digest-zsh-4.2.6-r1 371
-MD5 c4330d1b151cc380d5b167c674678b99 files/digest-zsh-4.3.2 482
-RMD160 dfa3044b90f90d80a52adbbd41b3f76c8faeff83 files/digest-zsh-4.3.2 482
-SHA256 f5135fd5e1cd2562050f593eb0377d20e5a363c405953c0c39eec03a5b215ef3 files/digest-zsh-4.3.2 482
+MD5 8e74039b4629755c3525e10b8a828be7 files/digest-zsh-4.2.5 555
+RMD160 b6c6ce72445c7acdb19cdfdbe50b6a2710114008 files/digest-zsh-4.2.5 555
+SHA256 948d673963b6bad68aafda6d3c1323603a0ecc8d9ef6a97398d44686eaecf86e files/digest-zsh-4.2.5 555
+MD5 2c1af52ab8cd4ba670c84cb2a4061b09 files/digest-zsh-4.2.6-r1 555
+RMD160 1d79980fff1b69c91969a9369630b77a7936593a files/digest-zsh-4.2.6-r1 555
+SHA256 2c6ce96427dbff4fa161f30aa15793d52f6ddea6e1b41feaf6933ff4e33b2796 files/digest-zsh-4.2.6-r1 555
 MD5 c4330d1b151cc380d5b167c674678b99 files/digest-zsh-4.3.2-r1 482
 RMD160 dfa3044b90f90d80a52adbbd41b3f76c8faeff83 files/digest-zsh-4.3.2-r1 482
 SHA256 f5135fd5e1cd2562050f593eb0377d20e5a363c405953c0c39eec03a5b215ef3 files/digest-zsh-4.3.2-r1 482
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9-r4 b/app-shells/zsh/files/digest-zsh-4.0.9-r4
deleted file mode 100644
index 2353cfc13ec3..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.9-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7032dd0a992cba7bb903ab90a9ca667 zsh-4.0.9-doc.tar.bz2 1411985
-MD5 1e755a2ffa0bad11b0ebc7d5d7622674 zsh-4.0.9-euc-0.2.patch.gz 2869
-MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
diff --git a/app-shells/zsh/files/digest-zsh-4.2.4 b/app-shells/zsh/files/digest-zsh-4.2.4
deleted file mode 100644
index 9eb4c7507e92..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.2.4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 5ffbe07c766dae7708f3f0eb2c1a779f zsh-4.2.4-doc.tar.bz2 1766830
-MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
-MD5 5c37fa9eb659458fe4f7f80da17fb09c zsh-4.2.4.tar.bz2 2089657
-RMD160 15102991181b4bf39dd6413f298388b6a8058ee4 zsh-4.2.4.tar.bz2 2089657
-SHA256 a649ab9285e27c759dc2017a55cbe5b948b07743ebca62ccf8f7239d38bc4c0e zsh-4.2.4.tar.bz2 2089657
diff --git a/app-shells/zsh/files/digest-zsh-4.2.6 b/app-shells/zsh/files/digest-zsh-4.2.6
deleted file mode 100644
index 8618a19309cf..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.2.6
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 8172d69a12886c85b0a4b579a695dffe zsh-4.2.4-euc-0.3.patch.gz 2942
-MD5 3ca3b7c199db6eb942f2a296e3fad270 zsh-4.2.6-doc.tar.bz2 1770113
-MD5 2cefebf742c190cbc611baded825db64 zsh-4.2.6.tar.bz2 2098671
-RMD160 e4400fc6311bf6996128ecf7899592d6d8cdb310 zsh-4.2.6.tar.bz2 2098671
-SHA256 d5b9b93e8259d3059042e82d1738d623af6981c38c9f185b3949ea3dacbe6a61 zsh-4.2.6.tar.bz2 2098671
diff --git a/app-shells/zsh/files/digest-zsh-4.3.2 b/app-shells/zsh/files/digest-zsh-4.3.2
deleted file mode 100644
index 5acb23db53a4..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.3.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 69d1ab9d179d7d16eb0251a0a60e0457 zsh-4.3.2-doc.tar.bz2 2207375
-RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff zsh-4.3.2-doc.tar.bz2 2207375
-SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f zsh-4.3.2-doc.tar.bz2 2207375
-MD5 e13fc4bb338fbb27ef7508a474310c8f zsh-4.3.2.tar.bz2 2263544
-RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e zsh-4.3.2.tar.bz2 2263544
-SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 zsh-4.3.2.tar.bz2 2263544
diff --git a/app-shells/zsh/files/zsh-strncmp.diff b/app-shells/zsh/files/zsh-strncmp.diff
deleted file mode 100644
index c75b28048542..000000000000
--- a/app-shells/zsh/files/zsh-strncmp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/Zle/compmatch.c.orig	2004-01-15 18:37:39.000000000 -0600
-+++ Src/Zle/compmatch.c	2004-01-15 18:38:45.000000000 -0600
-@@ -341,7 +341,7 @@
- 
-     /* If the anchors are equal, we keep only one. */
- 
--    if (!strncmp(l, w, wl))
-+    if (wl == 0 || !strncmp(l, w, wl))
- 	l = NULL;
- 
-     /* Split the new part into parts and turn the last one into a
diff --git a/app-shells/zsh/zsh-4.0.9-r4.ebuild b/app-shells/zsh/zsh-4.0.9-r4.ebuild
deleted file mode 100644
index c3abcdece25d..000000000000
--- a/app-shells/zsh/zsh-4.0.9-r4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r4.ebuild,v 1.4 2006/05/25 17:40:49 merlin Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )
-	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha"
-IUSE="maildir ncurses static doc cjk"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
-DEPEND="${RDEPEND}
-	virtual/libc
-	sys-apps/groff"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ../${P}-euc-0.2.patch
-	epatch ${FILESDIR}/${PN}-strncmp.diff
-	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
-	cd ${S}/Doc
-	ln -sf . man1
-	# fix zshall problem with soelim
-	soelim zshall.1 > zshall.1.soelim
-	mv zshall.1.soelim zshall.1
-}
-
-src_compile() {
-	local myconf
-
-	use ncurses && myconf="--with-curses-terminfo"
-	use maildir && myconf="${myconf} --enable-maildir-support"
-	use static \
-		&& myconf="${myconf} --disable-dynamic" \
-		&& append-ldflags -static
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/lib \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		${myconf} || die "configure failed"
-	# emake still b0rks
-	make || die "make failed"
-}
-
-src_test() {
-	addpredict /dev/ptmx
-	make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/lib \
-		fndir=${D}/usr/share/zsh/${PV}/functions \
-		sitefndir=${D}/usr/share/zsh/site-functions \
-		install.bin install.man install.modules \
-		install.info install.fns || die "make install failed"
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zprofile
-
-	keepdir /usr/share/zsh/site-functions
-
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
-
-	if use doc ; then
-		dohtml Doc/*
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_preinst() {
-	# Our zprofile file does the job of the old zshenv file
-	# Move the old version into a zprofile script so the normal
-	# etc-update process will handle any changes.
-	if [ -f ${ROOT}/etc/zsh/zshenv -a ! -f ${ROOT}/etc/zsh/zprofile ]; then
-		mv ${ROOT}/etc/zsh/zshenv ${ROOT}/etc/zsh/zprofile
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to enable Portage completion,"
-	einfo "emerge app-shells/zsh-completion and add"
-	einfo "	autoload -U compinit"
-	einfo "	compinit"
-	einfo "to your ~/.zshrc"
-	einfo
-}
diff --git a/app-shells/zsh/zsh-4.2.4.ebuild b/app-shells/zsh/zsh-4.2.4.ebuild
deleted file mode 100644
index ee11fc962fef..000000000000
--- a/app-shells/zsh/zsh-4.2.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.4.ebuild,v 1.9 2006/05/25 17:40:49 merlin Exp $
-
-inherit eutils
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	linguas_ja? ( http://www.ono.org/software/dist/${PN}-4.2.4-euc-0.3.patch.gz )
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc-macos sparc x86"
-IUSE="maildir ncurses static doc pcre cap"
-
-RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
-	cap? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack ${P}-doc.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-4.2.1-gentoo.diff
-	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
-	use linguas_ja && epatch ${DISTDIR}/${PN}-4.2.4-euc-0.3.patch.gz
-	cd ${S}/Doc
-	ln -sf . man1
-	# fix zshall problem with soelim
-	soelim zshall.1 > zshall.1.soelim
-	mv zshall.1.soelim zshall.1
-}
-
-src_compile() {
-	local myconf
-
-	use static && myconf="${myconf} --disable-dynamic" \
-		&& LDFLAGS="${LDFLAGS} -static"
-
-	if use ppc-macos; then
-		LDFLAGS="${LDFLAGS} -Wl,-x"
-		myconf="${myconf} --enable-libs=-liconv"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/lib \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--with-tcsetpgrp \
-		$(use_with ncurses curses-terminfo) \
-		$(use_enable maildir maildir-support) \
-		$(use_enable pcre) \
-		$(use_enable cap) \
-		${myconf} || die "configure failed"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		sed -i -e "s/link=no/link=static/g" \
-			-e "s/load=no/load=yes/g" \
-			config.modules || die
-	else
-		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/lib/libpcre.a%" \
-			Makefile || die
-	fi
-
-	# emake still b0rks
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	addpredict /dev/ptmx
-	make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/lib \
-		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
-		sitefndir=${D}/usr/share/zsh/site-functions \
-		install.bin install.man install.modules \
-		install.info install.fns || die "make install failed"
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins ${FILESDIR}/prompt_gentoo_setup || die
-
-	# install miscellaneous scripts; bug #54520
-	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
-	insinto /usr/share/zsh/${PV%_*}/Util
-	doins Util/* || die "doins Util scripts failed"
-	insinto /usr/share/zsh/${PV%_*}/Misc
-	doins Misc/* || die "doins Misc scripts failed"
-
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
-
-	if use doc ; then
-		dohtml Doc/*
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_preinst() {
-	# Our zprofile file does the job of the old zshenv file
-	# Move the old version into a zprofile script so the normal
-	# etc-update process will handle any changes.
-	if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then
-		mv /etc/zsh/zshenv /etc/zsh/zprofile
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to enable Portage completions and Gentoo prompt,"
-	einfo "emerge app-shells/zsh-completion and add"
-	einfo "	autoload -U compinit promptinit"
-	einfo "	compinit"
-	einfo "	promptinit; prompt gentoo"
-	einfo "to your ~/.zshrc"
-	einfo
-	einfo "Also, if you want to enable cache for the completions, add"
-	einfo "	zstyle ':completion::complete:*' use-cache 1"
-	einfo "to your ~/.zshrc"
-	einfo
-	# see Bug 26776
-	ewarn
-	ewarn "If you are upgrading from zsh-4.0.x you may need to"
-	ewarn "remove all your old ~/.zcompdump files in order to use"
-	ewarn "completion.  For more info see zcompsys manpage."
-	ewarn
-}
diff --git a/app-shells/zsh/zsh-4.2.6.ebuild b/app-shells/zsh/zsh-4.2.6.ebuild
deleted file mode 100644
index c1f3c9b48819..000000000000
--- a/app-shells/zsh/zsh-4.2.6.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.6.ebuild,v 1.4 2006/09/03 06:04:34 vapier Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	linguas_ja? ( http://www.ono.org/software/dist/${PN}-4.2.4-euc-0.3.patch.gz )
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sh ~sparc ~x86"
-IUSE="maildir ncurses static doc pcre cap"
-
-RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
-	cap? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack ${P}-doc.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
-	use linguas_ja && epatch ${DISTDIR}/${PN}-4.2.4-euc-0.3.patch.gz
-	cd ${S}/Doc
-	ln -sf . man1
-	# fix zshall problem with soelim
-	soelim zshall.1 > zshall.1.soelim
-	mv zshall.1.soelim zshall.1
-}
-
-src_compile() {
-	local myconf
-
-	use static && myconf="${myconf} --disable-dynamic" \
-		&& LDFLAGS="${LDFLAGS} -static"
-
-	if use ppc-macos; then
-		LDFLAGS="${LDFLAGS} -Wl,-x"
-		myconf="${myconf} --enable-libs=-liconv"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--with-tcsetpgrp \
-		$(use_with ncurses curses-terminfo) \
-		$(use_enable maildir maildir-support) \
-		$(use_enable pcre) \
-		$(use_enable cap) \
-		${myconf} || die "configure failed"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		sed -i -e "s/link=no/link=static/g" \
-			-e "s/load=no/load=yes/g" \
-			config.modules || die
-	else
-		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
-			Makefile || die
-	fi
-
-	# emake still b0rks
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	for f in /dev/pt* ; do
-		addpredict $f
-	done
-	make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/$(get_libdir) \
-		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
-		sitefndir=${D}/usr/share/zsh/site-functions \
-		install.bin install.man install.modules \
-		install.info install.fns || die "make install failed"
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins ${FILESDIR}/prompt_gentoo_setup || die
-
-	# install miscellaneous scripts; bug #54520
-	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
-	insinto /usr/share/zsh/${PV%_*}/Util
-	doins Util/* || die "doins Util scripts failed"
-	insinto /usr/share/zsh/${PV%_*}/Misc
-	doins Misc/* || die "doins Misc scripts failed"
-
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
-
-	if use doc ; then
-		dohtml Doc/*
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_preinst() {
-	# Our zprofile file does the job of the old zshenv file
-	# Move the old version into a zprofile script so the normal
-	# etc-update process will handle any changes.
-	if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then
-		mv /etc/zsh/zshenv /etc/zsh/zprofile
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to enable Portage completions and Gentoo prompt,"
-	einfo "emerge app-shells/zsh-completion and add"
-	einfo "	autoload -U compinit promptinit"
-	einfo "	compinit"
-	einfo "	promptinit; prompt gentoo"
-	einfo "to your ~/.zshrc"
-	einfo
-	einfo "Also, if you want to enable cache for the completions, add"
-	einfo "	zstyle ':completion::complete:*' use-cache 1"
-	einfo "to your ~/.zshrc"
-	einfo
-	# see Bug 26776
-	ewarn
-	ewarn "If you are upgrading from zsh-4.0.x you may need to"
-	ewarn "remove all your old ~/.zcompdump files in order to use"
-	ewarn "completion.  For more info see zcompsys manpage."
-	ewarn
-}
diff --git a/app-shells/zsh/zsh-4.3.2.ebuild b/app-shells/zsh/zsh-4.3.2.ebuild
deleted file mode 100644
index 3ef3368e623c..000000000000
--- a/app-shells/zsh/zsh-4.3.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2.ebuild,v 1.4 2006/09/03 06:04:34 vapier Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sh ~sparc ~x86"
-IUSE="maildir ncurses static doc pcre cap unicode"
-
-RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
-	cap? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack ${P}-doc.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
-	cd ${S}/Doc
-	ln -sf . man1
-	# fix zshall problem with soelim
-	soelim zshall.1 > zshall.1.soelim
-	mv zshall.1.soelim zshall.1
-}
-
-src_compile() {
-	local myconf
-
-	use static && myconf="${myconf} --disable-dynamic" \
-		&& LDFLAGS="${LDFLAGS} -static"
-
-	if use ppc-macos; then
-		LDFLAGS="${LDFLAGS} -Wl,-x"
-		myconf="${myconf} --enable-libs=-liconv"
-	fi
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/$(get_libdir) \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		--enable-ldflags="${LDFLAGS}" \
-		--with-tcsetpgrp \
-		$(use_with ncurses curses-terminfo) \
-		$(use_enable maildir maildir-support) \
-		$(use_enable pcre) \
-		$(use_enable cap) \
-		$(use_enable unicode multibyte) \
-		${myconf} || die "configure failed"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		sed -i -e "s/link=no/link=static/g" \
-			-e "s/load=no/load=yes/g" \
-			config.modules || die
-	else
-		# avoid linking to libs in /usr/lib, see Bug #27064
-		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
-			Makefile || die
-	fi
-
-	# emake still b0rks
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	for f in /dev/pt* ; do
-		addpredict $f
-	done
-	make check || die "make check failed"
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin \
-		libdir=${D}/usr/$(get_libdir) \
-		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
-		sitefndir=${D}/usr/share/zsh/site-functions \
-		scriptdir=${D}/usr/share/zsh/${PV%_*}/scripts \
-		install.bin install.man install.modules \
-		install.info install.fns || die "make install failed"
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	doins ${FILESDIR}/prompt_gentoo_setup || die
-
-	# install miscellaneous scripts; bug #54520
-	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
-	insinto /usr/share/zsh/${PV%_*}/Util
-	doins Util/* || die "doins Util scripts failed"
-	insinto /usr/share/zsh/${PV%_*}/Misc
-	doins Misc/* || die "doins Misc scripts failed"
-
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
-
-	if use doc ; then
-		dohtml Doc/*
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh{.dvi,_us.ps,_a4.ps}
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_preinst() {
-	# Our zprofile file does the job of the old zshenv file
-	# Move the old version into a zprofile script so the normal
-	# etc-update process will handle any changes.
-	if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then
-		mv /etc/zsh/zshenv /etc/zsh/zprofile
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to enable Portage completions and Gentoo prompt,"
-	einfo "emerge app-shells/zsh-completion and add"
-	einfo "	autoload -U compinit promptinit"
-	einfo "	compinit"
-	einfo "	promptinit; prompt gentoo"
-	einfo "to your ~/.zshrc"
-	einfo
-	einfo "Also, if you want to enable cache for the completions, add"
-	einfo "	zstyle ':completion::complete:*' use-cache 1"
-	einfo "to your ~/.zshrc"
-	einfo
-	# see Bug 26776
-	ewarn
-	ewarn "If you are upgrading from zsh-4.0.x you may need to"
-	ewarn "remove all your old ~/.zcompdump files in order to use"
-	ewarn "completion.  For more info see zcompsys manpage."
-	ewarn
-}