From 76bf4abaea0898481e541993dc382e10a5ecfce0 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <ticho@gentoo.org>
Date: Fri, 23 Mar 2007 21:22:07 +0000
Subject: [PATCH] Add a note about passfile feature and used file name in
 pkg_postinst(). Suggested by Rob Scott <rscott13 at comcast.net> in bug
 #171831. Unneeded ebuilds cleanup. Package-Manager: portage-2.1.2.2

---
 mail-client/pine/ChangeLog                    |  11 +-
 mail-client/pine/Manifest                     |  90 ++++-----
 mail-client/pine/files/digest-pine-4.61-r5    |   6 -
 mail-client/pine/files/digest-pine-4.63-r3    |   6 -
 mail-client/pine/files/digest-pine-4.64-r4    |   6 -
 ...k.patch => pine-4.64-rename-symlink.patch} |   0
 mail-client/pine/pine-4.61-r5.ebuild          | 160 ----------------
 mail-client/pine/pine-4.63-r3.ebuild          | 175 -----------------
 mail-client/pine/pine-4.64-r1.ebuild          |   9 +-
 mail-client/pine/pine-4.64-r3.ebuild          |   9 +-
 mail-client/pine/pine-4.64-r4.ebuild          | 176 ------------------
 mail-client/pine/pine-4.64-r5.ebuild          |  14 +-
 mail-client/pine/pine-4.64-r6.ebuild          |   7 +-
 mail-client/pine/pine-4.64.ebuild             |  11 +-
 14 files changed, 80 insertions(+), 600 deletions(-)
 delete mode 100644 mail-client/pine/files/digest-pine-4.61-r5
 delete mode 100644 mail-client/pine/files/digest-pine-4.63-r3
 delete mode 100644 mail-client/pine/files/digest-pine-4.64-r4
 rename mail-client/pine/files/{rename-symlink.patch => pine-4.64-rename-symlink.patch} (100%)
 delete mode 100644 mail-client/pine/pine-4.61-r5.ebuild
 delete mode 100644 mail-client/pine/pine-4.63-r3.ebuild
 delete mode 100644 mail-client/pine/pine-4.64-r4.ebuild

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 590aac0f2e40..7e9dc215c869 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.93 2007/03/20 14:06:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.94 2007/03/23 21:22:07 ticho Exp $
+
+  23 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/pine-4.64-rename-symlink.patch, -files/rename-symlink.patch,
+  -pine-4.61-r5.ebuild, -pine-4.63-r3.ebuild, pine-4.64.ebuild,
+  pine-4.64-r1.ebuild, pine-4.64-r3.ebuild, -pine-4.64-r4.ebuild,
+  pine-4.64-r5.ebuild, pine-4.64-r6.ebuild:
+  Add a note about passfile feature and used file name in pkg_postinst().
+  Suggested by Rob Scott <rscott13 at comcast.net> in bug #171831. Unneeded
+  ebuilds cleanup.
 
   20 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> pine-4.64-r5.ebuild:
   Stable on sparc wrt #170301
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 94195018d613..bf674c001dcc 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -41,71 +41,48 @@ AUX pine-4.62-spooldir-permissions.patch 488 RMD160 e286a3e588ab8440d6d33cc9eeb8
 MD5 7e8bb5286b4b14ec695fce340f8bb6b5 files/pine-4.62-spooldir-permissions.patch 488
 RMD160 e286a3e588ab8440d6d33cc9eeb81dbc17298afb files/pine-4.62-spooldir-permissions.patch 488
 SHA256 88eb08e815586a51ab453f709b0aae7bc2a5c09f5f7f74544c4cdcf718853c9b files/pine-4.62-spooldir-permissions.patch 488
-AUX rename-symlink.patch 860 RMD160 76a815fad144699892158cd99a1f18e55d7b6b06 SHA1 d7f909f90ba1146629b12a5dd21c7b892f21cde0 SHA256 0ae8442d1e8b7f9a9d6f64785238043c9749a0b3b46f7de4fded28b37463dc16
-MD5 a02b2e80929434b5bcae07a09ef0f51d files/rename-symlink.patch 860
-RMD160 76a815fad144699892158cd99a1f18e55d7b6b06 files/rename-symlink.patch 860
-SHA256 0ae8442d1e8b7f9a9d6f64785238043c9749a0b3b46f7de4fded28b37463dc16 files/rename-symlink.patch 860
+AUX pine-4.64-rename-symlink.patch 860 RMD160 76a815fad144699892158cd99a1f18e55d7b6b06 SHA1 d7f909f90ba1146629b12a5dd21c7b892f21cde0 SHA256 0ae8442d1e8b7f9a9d6f64785238043c9749a0b3b46f7de4fded28b37463dc16
+MD5 a02b2e80929434b5bcae07a09ef0f51d files/pine-4.64-rename-symlink.patch 860
+RMD160 76a815fad144699892158cd99a1f18e55d7b6b06 files/pine-4.64-rename-symlink.patch 860
+SHA256 0ae8442d1e8b7f9a9d6f64785238043c9749a0b3b46f7de4fded28b37463dc16 files/pine-4.64-rename-symlink.patch 860
 AUX transparency.patch 447 RMD160 47005c14ec0efb7fc484b164da7d6df6fe2f4e90 SHA1 3358b25f7d48160b0ca0c1ad0a146564e854fd1d SHA256 404a615f1c88a6e781fb4bd8ba87657dd4c505d566c2678fd7b15bd198efca00
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 RMD160 47005c14ec0efb7fc484b164da7d6df6fe2f4e90 files/transparency.patch 447
 SHA256 404a615f1c88a6e781fb4bd8ba87657dd4c505d566c2678fd7b15bd198efca00 files/transparency.patch 447
-DIST pine-4.61-r2-chappa-all.patch.gz 160672 RMD160 77bb10cbe3263252a96d5b6d2d5f43f5346d36c7 SHA1 688eec5dab0691783064a2441ee4164db7245649 SHA256 e136ee6d3f4d38cb8ee9ea905b801c466deb1450a8e8b4646e5dec54adae026d
-DIST pine-4.63-r3-chappa-all.patch.gz 169850 RMD160 0f3974c72d14dcf6cc849569a91ce796c043076d SHA1 7dd7dfb6f6e7f7cc9649dbb3e7db46f3c46fc646 SHA256 7700a780bac67b8131f1ee19b8ea448f7756589c20c413d0c3683ce4d0ac8d16
 DIST pine-4.64-chappa-all.patch.gz 168807 RMD160 f06525b5946076cd4b82c6c9538eb1f06670f25d SHA1 4e6f107ecbe9c8f83cc3650a60f400f116e943dd SHA256 6443a6f6ccdd37acfe65598473815ec025b03cf69a843662e7130464cef60665
 DIST pine-4.64-r1-chappa-all.patch.gz 168825 RMD160 e2fdf167f9eb449641bc335d873246eb0b21f597 SHA1 17a47da80a872878d0e0e9d9a100b92f7d1dc9f6 SHA256 dda66e3ec162fb41aac55be9c208537543c8f326784d7ab3e87851ba469084fe
 DIST pine-4.64-r3-chappa-all.patch.gz 172627 RMD160 f0682f3d8baf555f7940f0c2764a3b5870407a0d SHA1 0b1eae55685bc3b92523498c9591d61b5d40ea89 SHA256 6570a5b5daf5fec0c75feb90e5d9e561c33bff9223d60d01a32ade92754880fc
-DIST pine-4.64-r4-chappa-all.patch.gz 181492 RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b SHA1 a2e544103e7792d9a5c9645e80756b0ba18f4014 SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be
 DIST pine-4.64-r5-chappa-all.patch.gz 181492 RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b SHA1 a2e544103e7792d9a5c9645e80756b0ba18f4014 SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be
 DIST pine-4.64-r6-chappa-all.patch.gz 187656 RMD160 e92a34550e1207afce198b38199ab69e3325f872 SHA1 d0a897426cb5cbd9a247abdf85b337592d1f6ec2 SHA256 3fdf3149befeb8837613c7495ff75cdb63c157b393b040f02b90327f6398b09c
-DIST pine4.61.tar.bz2 3032253 RMD160 02c3e6998fb269535410f9d669d8a0f30f96cccd SHA1 74d3b5d0d7e7364be48d705d67fa52fb8eb1b5fc SHA256 6d1478b018c358379997c03262b401f7e69164e92345687248feb5251300c56c
-DIST pine4.63.tar.bz2 3083721 RMD160 b04a6f5134aeae6b0a5663acbfa4e812c3fc7762 SHA1 ad235c1fad7cc8adfff5c69cea8eb267afa648c9 SHA256 86c5914c6d45ca7490035e39dd4eb2a52d8ae0fec2e05d71fdaa6bd4448f1f8f
 DIST pine4.64.tar.bz2 3110790 RMD160 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd SHA1 b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e SHA256 5a697f1ffed84bba2dddb3534d0829eab6dacd169ea0122621e6b3dd522eb783
-EBUILD pine-4.61-r5.ebuild 4965 RMD160 52f6092ac9a9794eec082c840f2cd64bf5d83efc SHA1 a192870e36bcaf40dc92b596bcaefc65f2bd9a46 SHA256 4cd5628c16e94170979bc1d8ecc07e46a19c7c2fa87da8cb3ffe650c54cef733
-MD5 ab3a9759afaf363ae1c1e22a7db9ad2b pine-4.61-r5.ebuild 4965
-RMD160 52f6092ac9a9794eec082c840f2cd64bf5d83efc pine-4.61-r5.ebuild 4965
-SHA256 4cd5628c16e94170979bc1d8ecc07e46a19c7c2fa87da8cb3ffe650c54cef733 pine-4.61-r5.ebuild 4965
-EBUILD pine-4.63-r3.ebuild 5402 RMD160 786e368d0f3f135d67ccc73964a6da74ea0e5ba7 SHA1 b0f8da07c7ae283d7ac4db53bf7d18cba0dc6831 SHA256 cc13a3e5263fccc31d7a33af907d6bc7f710e3b810332290323dc47e6d8d42d4
-MD5 a1c02dbf19b66d4d12edc64d8156a272 pine-4.63-r3.ebuild 5402
-RMD160 786e368d0f3f135d67ccc73964a6da74ea0e5ba7 pine-4.63-r3.ebuild 5402
-SHA256 cc13a3e5263fccc31d7a33af907d6bc7f710e3b810332290323dc47e6d8d42d4 pine-4.63-r3.ebuild 5402
-EBUILD pine-4.64-r1.ebuild 5372 RMD160 7d3eeae14395cfd218e26f576c168ba7ae4669dc SHA1 cdc3b4f11bf65014f2a352dfd16c7dfd9b7b4bb4 SHA256 e76b30e7047b309abefcc7d8239e72ef453e98196ca7eef00fcae18128f33b58
-MD5 ed2aa64baf71950c5c68ced6d170c515 pine-4.64-r1.ebuild 5372
-RMD160 7d3eeae14395cfd218e26f576c168ba7ae4669dc pine-4.64-r1.ebuild 5372
-SHA256 e76b30e7047b309abefcc7d8239e72ef453e98196ca7eef00fcae18128f33b58 pine-4.64-r1.ebuild 5372
-EBUILD pine-4.64-r3.ebuild 5370 RMD160 42df9d2f10aaf8312f57fdaf5e534a6b0b2771b0 SHA1 531e55df388b5b579f944ffea91a13c3729b6a0e SHA256 f5d7f0e2009543e723afe6c4f0ea78c44daaff01cdbe6fc7cb3f2571f4829c51
-MD5 f78b7f52984f2160150b6851b6566668 pine-4.64-r3.ebuild 5370
-RMD160 42df9d2f10aaf8312f57fdaf5e534a6b0b2771b0 pine-4.64-r3.ebuild 5370
-SHA256 f5d7f0e2009543e723afe6c4f0ea78c44daaff01cdbe6fc7cb3f2571f4829c51 pine-4.64-r3.ebuild 5370
-EBUILD pine-4.64-r4.ebuild 5374 RMD160 eb79ec500f835de1e933f6276323e0091ba7bd04 SHA1 6948d8044ed1104094e910515482326a16a60fe8 SHA256 e3ac2dae3b4488a9a1282562776b60cef1e74ef156ffd73b0bca6eab4ec1f183
-MD5 6aa72eeec3e82db597b020df1aa1f7df pine-4.64-r4.ebuild 5374
-RMD160 eb79ec500f835de1e933f6276323e0091ba7bd04 pine-4.64-r4.ebuild 5374
-SHA256 e3ac2dae3b4488a9a1282562776b60cef1e74ef156ffd73b0bca6eab4ec1f183 pine-4.64-r4.ebuild 5374
-EBUILD pine-4.64-r5.ebuild 5342 RMD160 6a4b85ff9dfa3b0d9f8f26450f8e60599cda4941 SHA1 94678970f2473c2fa111f087a7d2ee8b4e5573b6 SHA256 cc6ca09f40d255cdd4a5fb645fc524071ba95b234aba6f97782549a672bd2b4c
-MD5 009ebe258fa3753c2d16020228627613 pine-4.64-r5.ebuild 5342
-RMD160 6a4b85ff9dfa3b0d9f8f26450f8e60599cda4941 pine-4.64-r5.ebuild 5342
-SHA256 cc6ca09f40d255cdd4a5fb645fc524071ba95b234aba6f97782549a672bd2b4c pine-4.64-r5.ebuild 5342
-EBUILD pine-4.64-r6.ebuild 5354 RMD160 c56453541b5500b91c08b09846f34ca22d20f764 SHA1 86190c586169069dbaa6b03aff11f62558435eae SHA256 23d950689b6e44b6884b5af558cbf693b41a8a2c64d3c9b9f78662a929871216
-MD5 cfecb8b9163575b7aabc29cd7ee9df4a pine-4.64-r6.ebuild 5354
-RMD160 c56453541b5500b91c08b09846f34ca22d20f764 pine-4.64-r6.ebuild 5354
-SHA256 23d950689b6e44b6884b5af558cbf693b41a8a2c64d3c9b9f78662a929871216 pine-4.64-r6.ebuild 5354
-EBUILD pine-4.64.ebuild 5398 RMD160 2f71df1636656f438d01e35f987ce9d7c016807f SHA1 d715d9cbed03cf98b663bb6b6bd92404dd295cd3 SHA256 5337058ce765a560ceb3ae0296f9f84ebbbf005f41a445137cf2727260d85ba5
-MD5 426cb4e53daf96ccce11f6183cc5d054 pine-4.64.ebuild 5398
-RMD160 2f71df1636656f438d01e35f987ce9d7c016807f pine-4.64.ebuild 5398
-SHA256 5337058ce765a560ceb3ae0296f9f84ebbbf005f41a445137cf2727260d85ba5 pine-4.64.ebuild 5398
-MISC ChangeLog 21316 RMD160 fa3e86c7dc17f05c640f59f75d28e1a5eb0fdb8e SHA1 087e66a89409bad98c894f973638139e00954408 SHA256 aea416a570be4c7d6e4f634db7fc1623d7c8b407adb18a00e36eb835e2caa71b
-MD5 311a080a84d15deaa63dad316d4d8e88 ChangeLog 21316
-RMD160 fa3e86c7dc17f05c640f59f75d28e1a5eb0fdb8e ChangeLog 21316
-SHA256 aea416a570be4c7d6e4f634db7fc1623d7c8b407adb18a00e36eb835e2caa71b ChangeLog 21316
+EBUILD pine-4.64-r1.ebuild 5518 RMD160 1492c642d24308a69b09e3c657b26f2af337aea4 SHA1 83947d49fb37dfc312841dcde2c15d124a67b15e SHA256 1989d30eda2de500bc74bc93c0a1b8b9b6c5b892caa5d03eb0b0805c9b9aee4a
+MD5 1036c3c593242ca7c04c797b21580dfd pine-4.64-r1.ebuild 5518
+RMD160 1492c642d24308a69b09e3c657b26f2af337aea4 pine-4.64-r1.ebuild 5518
+SHA256 1989d30eda2de500bc74bc93c0a1b8b9b6c5b892caa5d03eb0b0805c9b9aee4a pine-4.64-r1.ebuild 5518
+EBUILD pine-4.64-r3.ebuild 5517 RMD160 acd26fa212922466b4fb386199c053a887aa083e SHA1 f98ac6363f1ceec4893e600a090a6c4a957073a0 SHA256 8e33440f19c9ad45be63792625c3f47faa2a40fc2434993d6d87e6f636038dac
+MD5 4ecfbae6429593f0e3abb469a2fa588e pine-4.64-r3.ebuild 5517
+RMD160 acd26fa212922466b4fb386199c053a887aa083e pine-4.64-r3.ebuild 5517
+SHA256 8e33440f19c9ad45be63792625c3f47faa2a40fc2434993d6d87e6f636038dac pine-4.64-r3.ebuild 5517
+EBUILD pine-4.64-r5.ebuild 5546 RMD160 56b3c9fd704d4a301e0280c26a8174835054e595 SHA1 2f773a3ac1d77de557e9d0a705993e4536bc2ed9 SHA256 5701ea0baef007df9ee0cc899ca3394c78ccdfad171276b7378e3bc108d3d6f0
+MD5 09726d0bea14ec1f9bdb3d3ba3a252db pine-4.64-r5.ebuild 5546
+RMD160 56b3c9fd704d4a301e0280c26a8174835054e595 pine-4.64-r5.ebuild 5546
+SHA256 5701ea0baef007df9ee0cc899ca3394c78ccdfad171276b7378e3bc108d3d6f0 pine-4.64-r5.ebuild 5546
+EBUILD pine-4.64-r6.ebuild 5415 RMD160 172157a5690d0a7c5ae6dee799d4c999e1a6faf1 SHA1 a5fdf1c1c9031f16b21c85b608f745195406d2de SHA256 aecda75d2fc0395fc260e30b48d4fbda74b820be65e773de5c5c636c2e1ddb50
+MD5 a6be247bae5ed4845f5956e2699b9460 pine-4.64-r6.ebuild 5415
+RMD160 172157a5690d0a7c5ae6dee799d4c999e1a6faf1 pine-4.64-r6.ebuild 5415
+SHA256 aecda75d2fc0395fc260e30b48d4fbda74b820be65e773de5c5c636c2e1ddb50 pine-4.64-r6.ebuild 5415
+EBUILD pine-4.64.ebuild 5544 RMD160 cfd1479e82a3af757cd71cfd69c33fad9a373dad SHA1 7bf21ef647372827a8af7b168aca9b0c4900482c SHA256 0eb619e7775ea6f3e12894ff47a5d4c1ff4d992094ff807e47968a7928daf08f
+MD5 401b2d73f7d4dd254c4867e7f9694ea2 pine-4.64.ebuild 5544
+RMD160 cfd1479e82a3af757cd71cfd69c33fad9a373dad pine-4.64.ebuild 5544
+SHA256 0eb619e7775ea6f3e12894ff47a5d4c1ff4d992094ff807e47968a7928daf08f pine-4.64.ebuild 5544
+MISC ChangeLog 21775 RMD160 e3d8950fdc36883c5b29709bda177a77068830ae SHA1 86d3133e75fd5ebbb1f27d255ba65115da165f29 SHA256 890d941804b4b4e1c4d538dc561dc46203482a948a9cd93ab5d9ec6f03a0f9f1
+MD5 99cc487d3713ddde81f1e52a13eea709 ChangeLog 21775
+RMD160 e3d8950fdc36883c5b29709bda177a77068830ae ChangeLog 21775
+SHA256 890d941804b4b4e1c4d538dc561dc46203482a948a9cd93ab5d9ec6f03a0f9f1 ChangeLog 21775
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 ca8a3569e4acd0a628bbf738dbd13f43 files/digest-pine-4.61-r5 509
-RMD160 1dcd1dbf0d398d3af6508b7f5bceb507615a98d4 files/digest-pine-4.61-r5 509
-SHA256 5690ad45eb5a1e9a884ac016e08834e61e7fad19dee0369123530cba7bdbb7a0 files/digest-pine-4.61-r5 509
-MD5 d3c4a83c53c2a1d34b60389a15d64e8e files/digest-pine-4.63-r3 509
-RMD160 023efabbddd42a57e025fc3f1587968ad3199715 files/digest-pine-4.63-r3 509
-SHA256 8c8c02eca18b1709c7325bc826cc56aa7534eee2220547dd28ded0d946ad1205 files/digest-pine-4.63-r3 509
 MD5 f89cbed126731e53bc37060babf2f036 files/digest-pine-4.64 500
 RMD160 453502e8ba6bc8a835fa1d9e2cad7ae25710e9bc files/digest-pine-4.64 500
 SHA256 7cf7234237024e1c421629116e552f006d17a03b0438b496241dc3ec85733ace files/digest-pine-4.64 500
@@ -115,9 +92,6 @@ SHA256 50bc66c33a780ce4a04bcaa44c6824c5966e114e06023eee5cc00242935b4e05 files/di
 MD5 5b72075b1e44d71daeac91e12da55b37 files/digest-pine-4.64-r3 509
 RMD160 5769e8c4e2c900bae3d47fbba613beedd3389feb files/digest-pine-4.64-r3 509
 SHA256 de15698ef68041fd629de450333b1e72128f0ed153644075d9784d1735384e94 files/digest-pine-4.64-r3 509
-MD5 ed81cffb27e2c3f2c85abf958b69f8d3 files/digest-pine-4.64-r4 509
-RMD160 c80f632a217408df863eb2f4e24776c249e5c6b9 files/digest-pine-4.64-r4 509
-SHA256 a4f0d969831e832d6498fdf1627cf6231f641496de238577580e6ae60a831868 files/digest-pine-4.64-r4 509
 MD5 cc06d833379c1f6819c7a82235357222 files/digest-pine-4.64-r5 509
 RMD160 884eb6aec4a12255ae6be8e6d1c7a0a7fdd694bf files/digest-pine-4.64-r5 509
 SHA256 f02d8805a81d0077f980f437e8ab03882c427830ced5f1a0b8421eec4bd6bc32 files/digest-pine-4.64-r5 509
@@ -125,9 +99,9 @@ MD5 5236d2fcb2386fd6187069cc8689d462 files/digest-pine-4.64-r6 509
 RMD160 d352d8e46c7218f40ce36027e9c31e45b91b9ba3 files/digest-pine-4.64-r6 509
 SHA256 fdaa5ede0d0e79b8e4ca3fb5d6e7e683dd05136c8760f204a5b1ed09e29aa623 files/digest-pine-4.64-r6 509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF/+pZKRy60XGEcJIRArsxAKCJhV76ay0c3erdmshgQ4jLtfY8DwCgtXSQ
-HMzFwNlIeiAuuAEZKHGJjZc=
-=v9Pj
+iD8DBQFGBEUHQlM6RnzZP+IRAimuAJ46z1rzIJGECt0JoEOmB9YVDQeZFwCfX8Fq
+Q6EulkkuC+rBYl9OlDshUYc=
+=wnVn
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.61-r5 b/mail-client/pine/files/digest-pine-4.61-r5
deleted file mode 100644
index 29777e50c9a0..000000000000
--- a/mail-client/pine/files/digest-pine-4.61-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f8a98b202010698fc680e1ff06b8e425 pine-4.61-r2-chappa-all.patch.gz 160672
-RMD160 77bb10cbe3263252a96d5b6d2d5f43f5346d36c7 pine-4.61-r2-chappa-all.patch.gz 160672
-SHA256 e136ee6d3f4d38cb8ee9ea905b801c466deb1450a8e8b4646e5dec54adae026d pine-4.61-r2-chappa-all.patch.gz 160672
-MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
-RMD160 02c3e6998fb269535410f9d669d8a0f30f96cccd pine4.61.tar.bz2 3032253
-SHA256 6d1478b018c358379997c03262b401f7e69164e92345687248feb5251300c56c pine4.61.tar.bz2 3032253
diff --git a/mail-client/pine/files/digest-pine-4.63-r3 b/mail-client/pine/files/digest-pine-4.63-r3
deleted file mode 100644
index c15df67c4cbb..000000000000
--- a/mail-client/pine/files/digest-pine-4.63-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fb579abea4ec3359875de10da41ff45e pine-4.63-r3-chappa-all.patch.gz 169850
-RMD160 0f3974c72d14dcf6cc849569a91ce796c043076d pine-4.63-r3-chappa-all.patch.gz 169850
-SHA256 7700a780bac67b8131f1ee19b8ea448f7756589c20c413d0c3683ce4d0ac8d16 pine-4.63-r3-chappa-all.patch.gz 169850
-MD5 e881f439f38039b310d22554ab08feb4 pine4.63.tar.bz2 3083721
-RMD160 b04a6f5134aeae6b0a5663acbfa4e812c3fc7762 pine4.63.tar.bz2 3083721
-SHA256 86c5914c6d45ca7490035e39dd4eb2a52d8ae0fec2e05d71fdaa6bd4448f1f8f pine4.63.tar.bz2 3083721
diff --git a/mail-client/pine/files/digest-pine-4.64-r4 b/mail-client/pine/files/digest-pine-4.64-r4
deleted file mode 100644
index e14b67a475d6..000000000000
--- a/mail-client/pine/files/digest-pine-4.64-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0684c783061a2e1d48b8f340288ce9fd pine-4.64-r4-chappa-all.patch.gz 181492
-RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b pine-4.64-r4-chappa-all.patch.gz 181492
-SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be pine-4.64-r4-chappa-all.patch.gz 181492
-MD5 39ca07b3d305b4cd0d6aaf4585123275 pine4.64.tar.bz2 3110790
-RMD160 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd pine4.64.tar.bz2 3110790
-SHA256 5a697f1ffed84bba2dddb3534d0829eab6dacd169ea0122621e6b3dd522eb783 pine4.64.tar.bz2 3110790
diff --git a/mail-client/pine/files/rename-symlink.patch b/mail-client/pine/files/pine-4.64-rename-symlink.patch
similarity index 100%
rename from mail-client/pine/files/rename-symlink.patch
rename to mail-client/pine/files/pine-4.64-rename-symlink.patch
diff --git a/mail-client/pine/pine-4.61-r5.ebuild b/mail-client/pine/pine-4.61-r5.ebuild
deleted file mode 100644
index dadce7f0c9be..000000000000
--- a/mail-client/pine/pine-4.61-r5.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r5.ebuild,v 1.10 2007/03/20 09:32:55 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're using chappa patch revision 1 (see #59573)
-CHAPPA_PF="${P}-r2"
-
-DESCRIPTION="A tool for reading, sending and managing electronic messages."
-HOMEPAGE="http://www.washington.edu/pine/
-	http://staff.washington.edu/chappa/pine/"
-SRC_URI="ftp://ftp.cac.washington.edu/pine/${PN}${PV}.tar.bz2
-	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
-#	ipv6? (
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
-#	)"
-
-LICENSE="PICO"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
-#IUSE="ipv6 maildir ssl ldap kerberos passfile"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch"
-	# UTF8 support. Not ported. 4.60 has utf8 some conversion.
-	#epatch "${DISTDIR}/${PN}${PV}-utf8-to-singlebyte.patch"
-	# Fix flock() emulation.
-	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
-	# Build the flock() emulation.
-	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch"
-	if use ldap ; then
-		# Link to shared ldap libs instead of static.
-		epatch "${FILESDIR}/pine-4.30-ldap.patch"
-		mkdir "${S}/ldap"
-		ln -s /usr/lib "${S}/ldap/libraries"
-		ln -s /usr/include "${S}/ldap/include"
-	fi
-#	if use ipv6 ; then
-#		epatch "${DISTDIR}/${P}-v6-20031001.diff"
-#	fi
-	if use passfile ; then
-		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch"
-	fi
-	if use largeterminal ; then
-		# Add support for large terminals by doubling the size of pine's internal display buffer
-		epatch "${FILESDIR}/pine-4.61-largeterminal.patch"
-	fi
-
-	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch"
-	# Create lockfiles with a mode of 0600 instead of 0666.
-	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
-	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch"
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch"
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
-
-	if use debug ; then
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	else
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	fi
-
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
-		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
-			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
-			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
-	else
-		myconf="${myconf} NOSSL"
-	fi
-	if use ldap ; then
-		./contrib/ldap-setup lnp lnp
-		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
-	else
-		myconf="${myconf} NOLDAP"
-	fi
-	if use kerberos ; then
-		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
-	fi
-	if use pam ; then
-		target=lnp
-	else
-		target=slx
-	fi
-
-	./build ${myconf} ${target} || die "compile problem"
-}
-
-src_install() {
-	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload \
-	      mailutil/mailutil
-
-	# Only mailbase should install /etc/mailcap
-#	newins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 \
-	      imap/src/mailutil/mailutil.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	elog
-	elog "This build of Pine has Maildir support built in as"
-	elog "part of the chappa-all patch."
-	elog
-	elog "If you have a maildir at ~/Maildir it will be your"
-	elog "default INBOX. The path may be changed with the"
-	elog "\"maildir-location\" setting in Pine."
-	elog
-	elog "If you don't have any maildirs Pine works as before"
-	elog "with the INBOX at /var/spool/mail/."
-	elog
-}
diff --git a/mail-client/pine/pine-4.63-r3.ebuild b/mail-client/pine/pine-4.63-r3.ebuild
deleted file mode 100644
index ac0b61f2677f..000000000000
--- a/mail-client/pine/pine-4.63-r3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.63-r3.ebuild,v 1.10 2007/03/20 09:32:55 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them, and patch revision number doesn't
-# always have to correspond to ebuild revision number. (see #59573) 
-CHAPPA_PF="${P}-r3"
-
-DESCRIPTION="A tool for reading, sending and managing electronic messages."
-HOMEPAGE="http://www.washington.edu/pine/
-	http://staff.washington.edu/chappa/pine/"
-SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
-	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
-#	ipv6? (
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
-#	)"
-
-LICENSE="PICO"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-maildir_warn() {
-	elog
-	elog "This build of Pine has Maildir support built in as"
-	elog "part of the chappa-all patch."
-	elog
-	elog "If you have a maildir at ~/Maildir it will be your"
-	elog "default INBOX. The path may be changed with the"
-	elog "\"maildir-location\" setting in Pine."
-	elog
-	elog "To use /var/spool/mail INBOX again, set"
-	elog "\"disable-these-drivers=md\" in your .pinerc file."
-	elog
-	elog "Alternately, you might want to read following webpage, which explains how to"
-	elog "use multiple mailboxes simultaneously:"
-	elog
-	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
-	echo
-}
-
-pkg_setup() {
-	maildir_warn
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch" || die
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch" || die
-	# Fix flock() emulation.
-	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" || die
-	# Build the flock() emulation.
-	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch" || die
-	if use ldap ; then
-		# Link to shared ldap libs instead of static.
-		epatch "${FILESDIR}/pine-4.30-ldap.patch" || die
-		mkdir "${S}/ldap"
-		ln -s /usr/lib "${S}/ldap/libraries"
-		ln -s /usr/include "${S}/ldap/include"
-	fi
-#	if use ipv6 ; then
-#		epatch "${DISTDIR}/${P}-v6-20031001.diff" || die
-#	fi
-	if use passfile ; then
-		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch" || die
-	fi
-	if use largeterminal ; then
-		# Add support for large terminals by doubling the size of pine's internal display buffer
-		epatch "${FILESDIR}/pine-4.61-largeterminal.patch" || die
-	fi
-
-	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch" || die
-	# Create lockfiles with a mode of 0600 instead of 0666.
-	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch" || die
-	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch" || die
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch" || die
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch" || die
-
-	if use debug ; then
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	else
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	fi
-
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
-		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
-			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
-			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
-	else
-		myconf="${myconf} NOSSL"
-	fi
-	if use ldap ; then
-		./contrib/ldap-setup lnp lnp
-		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
-	else
-		myconf="${myconf} NOLDAP"
-	fi
-	if use kerberos ; then
-		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
-	fi
-
-	if use pam ; then
-		target=lnp
-	else
-		target=slx
-	fi
-
-	./build ${myconf} ${target} || die "compile problem"
-}
-
-src_install() {
-	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload \
-	      mailutil/mailutil
-
-	# Only mailbase should install /etc/mailcap
-#	newins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 \
-	      imap/src/mailutil/mailutil.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	maildir_warn
-}
diff --git a/mail-client/pine/pine-4.64-r1.ebuild b/mail-client/pine/pine-4.64-r1.ebuild
index 085cf87aadb8..fb0fbbf90b41 100644
--- a/mail-client/pine/pine-4.64-r1.ebuild
+++ b/mail-client/pine/pine-4.64-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r1.ebuild,v 1.11 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r1.ebuild,v 1.12 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -173,4 +173,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
diff --git a/mail-client/pine/pine-4.64-r3.ebuild b/mail-client/pine/pine-4.64-r3.ebuild
index 1798246f1f74..7c3ff3c23bef 100644
--- a/mail-client/pine/pine-4.64-r3.ebuild
+++ b/mail-client/pine/pine-4.64-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r3.ebuild,v 1.9 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r3.ebuild,v 1.10 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -173,4 +173,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
diff --git a/mail-client/pine/pine-4.64-r4.ebuild b/mail-client/pine/pine-4.64-r4.ebuild
deleted file mode 100644
index 3678508c37d9..000000000000
--- a/mail-client/pine/pine-4.64-r4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r4.ebuild,v 1.5 2007/03/20 09:32:55 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them, and patch revision number doesn't
-# always have to correspond to ebuild revision number. (see #59573) 
-CHAPPA_PF="${PF}"
-
-DESCRIPTION="A tool for reading, sending and managing electronic messages."
-HOMEPAGE="http://www.washington.edu/pine/
-	http://staff.washington.edu/chappa/pine/"
-SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
-	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
-#	ipv6? (
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
-#	)"
-
-LICENSE="PICO"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	net-mail/uw-mailutils
-	!<=net-mail/uw-imap-2004g"
-
-S="${WORKDIR}/${P/-/}"
-
-maildir_warn() {
-	elog
-	elog "This build of Pine has Maildir support built in as"
-	elog "part of the chappa-all patch."
-	elog
-	elog "If you have a maildir at ~/Maildir it will be your"
-	elog "default INBOX. The path may be changed with the"
-	elog "\"maildir-location\" setting in Pine."
-	elog
-	elog "To use /var/spool/mail INBOX again, set"
-	elog "\"disable-these-drivers=md\" in your .pinerc file."
-	elog
-	elog "Alternately, you might want to read following webpage, which explains how to"
-	elog "use multiple mailboxes simultaneously:"
-	elog
-	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
-	echo
-}
-
-pkg_setup() {
-	maildir_warn
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch" || die
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch" || die
-	# Fix flock() emulation.
-	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" || die
-	# Build the flock() emulation.
-	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch" || die
-	if use ldap ; then
-		# Link to shared ldap libs instead of static.
-		epatch "${FILESDIR}/pine-4.30-ldap.patch" || die
-		mkdir "${S}/ldap"
-		ln -s /usr/lib "${S}/ldap/libraries"
-		ln -s /usr/include "${S}/ldap/include"
-	fi
-#	if use ipv6 ; then
-#		epatch "${DISTDIR}/${P}-v6-20031001.diff" || die
-#	fi
-	if use passfile ; then
-		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch" || die
-	fi
-	if use largeterminal ; then
-		# Add support for large terminals by doubling the size of pine's internal display buffer
-		epatch "${FILESDIR}/pine-4.61-largeterminal.patch" || die
-	fi
-
-	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch" || die
-	# Create lockfiles with a mode of 0600 instead of 0666.
-	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch" || die
-	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch" || die
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch" || die
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch" || die
-
-	if use debug ; then
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	else
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	fi
-
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
-		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
-			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
-			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
-	else
-		myconf="${myconf} NOSSL"
-	fi
-	if use ldap ; then
-		./contrib/ldap-setup lnp lnp
-		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
-	else
-		myconf="${myconf} NOLDAP"
-	fi
-	if use kerberos ; then
-		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
-	fi
-
-	if use pam ; then
-		target=lnp
-	else
-		target=slx
-	fi
-
-	./build ${myconf} ${target} || die "compile problem"
-}
-
-src_install() {
-	dobin bin/pine bin/pico bin/pilot bin/rpdump bin/rpload
-
-	# Only mailbase should install /etc/mailcap
-#	newins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	maildir_warn
-}
diff --git a/mail-client/pine/pine-4.64-r5.ebuild b/mail-client/pine/pine-4.64-r5.ebuild
index f097fe192ea2..bcde51586702 100644
--- a/mail-client/pine/pine-4.64-r5.ebuild
+++ b/mail-client/pine/pine-4.64-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r5.ebuild,v 1.7 2007/03/20 14:06:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r5.ebuild,v 1.8 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -99,11 +99,10 @@ src_unpack() {
 	epatch "${FILESDIR}/imap-2000-time.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
 	epatch "${FILESDIR}/transparency.patch"
-
 	# Bug #72861 - relaxes subject length for base64-encoded subjects
 	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
-
-	epatch "${FILESDIR}/rename-symlink.patch"
+	# Bug #58664 - preserve symlink if a file gets rewritten
+	epatch "${FILESDIR}/${P}-rename-symlink.patch"
 
 	if use debug ; then
 		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
@@ -175,4 +174,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
diff --git a/mail-client/pine/pine-4.64-r6.ebuild b/mail-client/pine/pine-4.64-r6.ebuild
index c5ed46c10fd3..dbc043af5b0a 100644
--- a/mail-client/pine/pine-4.64-r6.ebuild
+++ b/mail-client/pine/pine-4.64-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r6.ebuild,v 1.1 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r6.ebuild,v 1.2 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -99,11 +99,10 @@ src_unpack() {
 	epatch "${FILESDIR}/imap-2000-time.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
 	epatch "${FILESDIR}/transparency.patch"
-
 	# Bug #72861 - relaxes subject length for base64-encoded subjects
 	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
-
-	epatch "${FILESDIR}/rename-symlink.patch"
+	# Bug #58664 - preserve symlink if a file gets rewritten
+	epatch "${FILESDIR}/${P}-rename-symlink.patch"
 
 	if use debug ; then
 		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
diff --git a/mail-client/pine/pine-4.64.ebuild b/mail-client/pine/pine-4.64.ebuild
index e7669e11fcce..9252ba45c339 100644
--- a/mail-client/pine/pine-4.64.ebuild
+++ b/mail-client/pine/pine-4.64.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64.ebuild,v 1.8 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64.ebuild,v 1.9 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -51,7 +51,7 @@ maildir_warn() {
 	elog "use multiple mailboxes simultaneously:"
 	elog
 	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
-	echo
+	elog
 }
 
 pkg_setup() {
@@ -172,4 +172,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
-- 
2.26.2