Removing gpg plugin because it is broken. See bug #202406.

Package-Manager: portage-2.1.4_rc11

8 files changed, 42 insertions, 314 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 09310a778c4d..dbae3e40533b 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.109 2008/01/10 17:06:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.110 2008/01/12 02:40:39 eradicator Exp $
+
+*squirrelmail-1.5.1-r7 (12 Jan 2008)
+*squirrelmail-1.4.13-r1 (12 Jan 2008)
+
+  12 Jan 2008; Jeremy Huddleston <eradicator@gentoo.org>
+  -squirrelmail-1.4.11.ebuild, -squirrelmail-1.4.13.ebuild,
+  +squirrelmail-1.4.13-r1.ebuild, -squirrelmail-1.5.1-r6.ebuild,
+  +squirrelmail-1.5.1-r7.ebuild:
+  Removing gpg plugin because it is broken.  See bug #202406.
 
   10 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
   squirrelmail-1.4.10a-r2.ebuild, squirrelmail-1.4.11.ebuild,
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index a2c9061810de..146b260b719d 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ldapuserdata-0.4-gentoo.patch 709 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 SHA1 99f5dd6f4e9666d6d3915c3e52c2694d1dc06a9e SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 files/ldapuserdata-0.4-gentoo.patch 709
@@ -50,7 +53,6 @@ DIST retrieveuserdata.0.9-1.4.0.tar.gz 10448 RMD160 942d073f86947295ed069ed04e4f
 DIST secure_login-1.3-1.2.8.tar.gz 16075 RMD160 1c8ef7f0f02846f59c9088f4703748d99bcd4c77 SHA1 c15f1b49810b2bb96086635e3f5c21d081a5a099 SHA256 0c44112114e1d3f2b8615b5b586631fb50fb1877037a438c37f4b890f46b0ccc
 DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d SHA1 39073e417ce28080f9206d068cbfa4161284be3e SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a
 DIST squirrelmail-1.4.10a.tar.bz2 484523 RMD160 4337f99575e1ada931cea461679b96acd5b4901d SHA1 b8a84e1fb69b6922c6bf817015201d57a82aa843 SHA256 b5e047c0a32b758b67e15772dc9c467d0ee830372858f7b9442a9a6aa6caf854
-DIST squirrelmail-1.4.11.tar.bz2 496370 RMD160 c43f8f35665d4c40eb0fbcd40a2a52f3b881e334 SHA1 f07ff0d2a963f591ee10847f8330bc1023af6353 SHA256 7c187933dd76fd0a13544851b17db12a9875f5d5eb2e2d6d16528b442fc20bb6
 DIST squirrelmail-1.4.13.tar.bz2 497103 RMD160 d2d27c9e2fe6225833da15981b9d6881ce55fc6d SHA1 cbc101076dfde6f78e871133fc6a17b5d3aa0edb SHA256 331ff58933f48f5d772d018c1ba1362867646005b3486d6006b1747e1fbc16d5
 DIST squirrelmail-1.5.1.tar.bz2 904370 RMD160 a59df6a73e5694b54d2791d4c139941ef220d2d1 SHA1 e6aa8fe560b17a1205b3af288e31a2404397f44e SHA256 3e7f370dd869fb57ed5b3c159d7450c1180309fffeda9dbf168b2d456f477909
 DIST squirrelmail-decode-1.2.tar.bz2 333942 RMD160 a217662f923a7e2129e293c6bf806dd0c21dab0b SHA1 90439c4644fd99b7ca4208b441ee0a2c2efa2308 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26
@@ -58,22 +60,18 @@ EBUILD squirrelmail-1.4.10a-r2.ebuild 6066 RMD160 28e852b185f5014849eca4f28de329
 MD5 ed57f96a49cb1f001f69acc308522956 squirrelmail-1.4.10a-r2.ebuild 6066
 RMD160 28e852b185f5014849eca4f28de32910d252fb67 squirrelmail-1.4.10a-r2.ebuild 6066
 SHA256 b675413ad9771353223b7466a4a4b7ba179801ca5d92129adb1cf4a5616d6a7d squirrelmail-1.4.10a-r2.ebuild 6066
-EBUILD squirrelmail-1.4.11.ebuild 6068 RMD160 47dacfe8366103b9d6a7eb5cfe8f83f81242e15b SHA1 9172aeea3c09bfcf108f816edbc58aab86c29512 SHA256 9d0aa89a24246863e1b0392a4fc0b10cd48b2b06b71bc851faf61738078bdb13
-MD5 77cfffab9b1ab6613004bc92a2ba4eda squirrelmail-1.4.11.ebuild 6068
-RMD160 47dacfe8366103b9d6a7eb5cfe8f83f81242e15b squirrelmail-1.4.11.ebuild 6068
-SHA256 9d0aa89a24246863e1b0392a4fc0b10cd48b2b06b71bc851faf61738078bdb13 squirrelmail-1.4.11.ebuild 6068
-EBUILD squirrelmail-1.4.13.ebuild 6068 RMD160 ff22c7d62c89069014c8b0e1900728afe440c0e1 SHA1 24454539cba98c871214515102465c12f49810f7 SHA256 79b4d465d4b1cec5cdc053e3df60e1f3bd471c457928299c6b0dcdffe8de18cc
-MD5 fa314bd0102cdcc308c48394b09e9380 squirrelmail-1.4.13.ebuild 6068
-RMD160 ff22c7d62c89069014c8b0e1900728afe440c0e1 squirrelmail-1.4.13.ebuild 6068
-SHA256 79b4d465d4b1cec5cdc053e3df60e1f3bd471c457928299c6b0dcdffe8de18cc squirrelmail-1.4.13.ebuild 6068
-EBUILD squirrelmail-1.5.1-r6.ebuild 5698 RMD160 3d84cd651eea861d2e1fe03951e3253647912f13 SHA1 67ba75acd33317a061c416334444bbe30c918d91 SHA256 f0726344aa00ac09ed36707fe2a06a5df5960324357848441b767b860b3c594d
-MD5 cf5d945facd860b39389da20388728cd squirrelmail-1.5.1-r6.ebuild 5698
-RMD160 3d84cd651eea861d2e1fe03951e3253647912f13 squirrelmail-1.5.1-r6.ebuild 5698
-SHA256 f0726344aa00ac09ed36707fe2a06a5df5960324357848441b767b860b3c594d squirrelmail-1.5.1-r6.ebuild 5698
-MISC ChangeLog 25052 RMD160 5447431842c8d3e5798f440900711f05ba15d0c5 SHA1 8f74057ca6606f293470ca7a459b677cf046488b SHA256 b54fba86a0b9a8db7b8a4b5a2132b7926cc4b559405b0aa4fbc1720d20c0e804
-MD5 34056baa0f1d37224b26889ecfc55908 ChangeLog 25052
-RMD160 5447431842c8d3e5798f440900711f05ba15d0c5 ChangeLog 25052
-SHA256 b54fba86a0b9a8db7b8a4b5a2132b7926cc4b559405b0aa4fbc1720d20c0e804 ChangeLog 25052
+EBUILD squirrelmail-1.4.13-r1.ebuild 5579 RMD160 287ada0c6157e34a87565282932c259cf3eaa3fe SHA1 d5e482562e06ae8db3542e559965f4a0b48419c1 SHA256 65d54e622c4c14e842e19893ec0e34506863e1f3cfa7f04cd654442a0d9d4e12
+MD5 850101661f88b96cd898af22ff8200aa squirrelmail-1.4.13-r1.ebuild 5579
+RMD160 287ada0c6157e34a87565282932c259cf3eaa3fe squirrelmail-1.4.13-r1.ebuild 5579
+SHA256 65d54e622c4c14e842e19893ec0e34506863e1f3cfa7f04cd654442a0d9d4e12 squirrelmail-1.4.13-r1.ebuild 5579
+EBUILD squirrelmail-1.5.1-r7.ebuild 5471 RMD160 f301a93217ee8e657b921e873c220b3f2063b956 SHA1 f7f26d3be85719bd1d7c4d9dd46a9c0d7f85bf8a SHA256 5a2c63cec48196e42518431d866b5a74150bf1b4f6c78b822acd44bc74cec39b
+MD5 39b33391138c3c1cd9880ec234d06fec squirrelmail-1.5.1-r7.ebuild 5471
+RMD160 f301a93217ee8e657b921e873c220b3f2063b956 squirrelmail-1.5.1-r7.ebuild 5471
+SHA256 5a2c63cec48196e42518431d866b5a74150bf1b4f6c78b822acd44bc74cec39b squirrelmail-1.5.1-r7.ebuild 5471
+MISC ChangeLog 25410 RMD160 7e530b99a874eb9032f09e534ab29bb21b4d0858 SHA1 263445bd6ced4e152ad875223b335cae28c53c30 SHA256 0ead29388bf3d3e8b6b0f468c5e369c12ecd677c547c773f6c16ccbd85dfc896
+MD5 cdc5ad4b2939c80aa8b372286bf62c3e ChangeLog 25410
+RMD160 7e530b99a874eb9032f09e534ab29bb21b4d0858 ChangeLog 25410
+SHA256 0ead29388bf3d3e8b6b0f468c5e369c12ecd677c547c773f6c16ccbd85dfc896 ChangeLog 25410
 MISC metadata.xml 258 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 SHA1 f969f9d21f42c6347a0509bacb7382b390c10ce8 SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680
 MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 metadata.xml 258
@@ -81,12 +79,16 @@ SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680 metadata
 MD5 9c4f9923f0aed49fdefae1df92518cee files/digest-squirrelmail-1.4.10a-r2 2894
 RMD160 61bd68ef0345dbca27de12be237c23899cb870a1 files/digest-squirrelmail-1.4.10a-r2 2894
 SHA256 2002a68252bd898171b6103c7793c7cb27345dafe04085c176926904de2be02b files/digest-squirrelmail-1.4.10a-r2 2894
-MD5 b5a0260c4f7f1c3dabca5f94ca908bc6 files/digest-squirrelmail-1.4.11 2891
-RMD160 df7050d9084385ca89b43697b555520db3d8553b files/digest-squirrelmail-1.4.11 2891
-SHA256 fd19637d048cae3a3ba10d08676def5ec7cb28e94701fc9a8292091a67b0df69 files/digest-squirrelmail-1.4.11 2891
-MD5 593354713cbe8804967d8e676fa12925 files/digest-squirrelmail-1.4.13 2891
-RMD160 06540c02c57445df6a7e4c219a34c3000d40645c files/digest-squirrelmail-1.4.13 2891
-SHA256 3ffeddefc228da9794c08df5da31ea6003d6ca4813b48d4f219d3ecc19cc8726 files/digest-squirrelmail-1.4.13 2891
-MD5 f633bec8187619a07dc6f4311d9a49b9 files/digest-squirrelmail-1.5.1-r6 2888
-RMD160 e1943280c3becec34b5be14ed81dc872b8a4b61c files/digest-squirrelmail-1.5.1-r6 2888
-SHA256 bccea80be202f16d9f59ff93aa3f47874855d5622d4d98bd95e1f5678cb4a193 files/digest-squirrelmail-1.5.1-r6 2888
+MD5 aeb0224608abb5e698e3758aaa04304a files/digest-squirrelmail-1.4.13-r1 2668
+RMD160 722c280b4bf2c664d4d59e1be1644aab9e228f48 files/digest-squirrelmail-1.4.13-r1 2668
+SHA256 7aa7280ed7e1426c970121a76ca69076477bcd0b72ac6610d3db4e380845f770 files/digest-squirrelmail-1.4.13-r1 2668
+MD5 2ad67d0ca961531c33d985afe202ddba files/digest-squirrelmail-1.5.1-r7 2665
+RMD160 39d1b5807d238259018b0e46301ecd6bf0de49ea files/digest-squirrelmail-1.5.1-r7 2665
+SHA256 47eb8117af699b3c2e24b8b27b031ff50055fb69455cc67a62a19aa0e80ac2e6 files/digest-squirrelmail-1.5.1-r7 2665
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iD8DBQFHiCi4jC1Anjf1NmMRAm/pAJ9bdgXH35fZAFViVGdP4cyitAzswwCfS4AS
+lhIqDZ7RFFsGVNPDtWLYmH0=
+=BT7D
+-----END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.11 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.11
deleted file mode 100644
index accc6907cda6..000000000000
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.11
+++ /dev/null
@@ -1,33 +0,0 @@
-MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
-RMD160 6847934c59ae73119a796c6fef251de26a2ea531 admin_add.0.1-1.4.0.tar.gz 2388
-SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc admin_add.0.1-1.4.0.tar.gz 2388
-MD5 eaa0e8835b8d7d451500aad907c22e24 all_locales-1.4.9-20070106.tar.bz2 2699569
-RMD160 9da0e3df1bc5a89b861f7dd9ac244a3885a45417 all_locales-1.4.9-20070106.tar.bz2 2699569
-SHA256 04ad3e37042deb8c5668946c3364cd53d9c30b2486f24deee4d71c05fa584423 all_locales-1.4.9-20070106.tar.bz2 2699569
-MD5 4766f5f6706e086d5c9370bef9e7629f amavisnewsql-0.8.0-1.4.tar.gz 101008
-RMD160 72b796565f128354c51e8a04384e49621371cf16 amavisnewsql-0.8.0-1.4.tar.gz 101008
-SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisnewsql-0.8.0-1.4.tar.gz 101008
-MD5 53e89f4ad52a93909a8c7d66ba5b2b1b compatibility-2.0.9-1.0.tar.gz 31763
-RMD160 8c0d18b0f0ffab3b2cddcf943dfcbccffc0b16ee compatibility-2.0.9-1.0.tar.gz 31763
-SHA256 49c8dce4ee257fb36a97396c7cdd445d2b862659dc76c17048d96d2634d64019 compatibility-2.0.9-1.0.tar.gz 31763
-MD5 1e422dd77d455f8b1d07a66dc7d8aaed gpg-2.1.tar.gz 539562
-RMD160 aeecb1ae1d2021677c19923532e94f9d81794c57 gpg-2.1.tar.gz 539562
-SHA256 639aef199f9ccd96817f8c04b5d130f1206e5181204915923ee3d0d420459573 gpg-2.1.tar.gz 539562
-MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
-RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
-SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
-MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
-RMD160 942d073f86947295ed069ed04e4fc268857932af retrieveuserdata.0.9-1.4.0.tar.gz 10448
-SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d retrieveuserdata.0.9-1.4.0.tar.gz 10448
-MD5 3dcd0c5bca4053621226ba7df955e51f secure_login-1.3-1.2.8.tar.gz 16075
-RMD160 1c8ef7f0f02846f59c9088f4703748d99bcd4c77 secure_login-1.3-1.2.8.tar.gz 16075
-SHA256 0c44112114e1d3f2b8615b5b586631fb50fb1877037a438c37f4b890f46b0ccc secure_login-1.3-1.2.8.tar.gz 16075
-MD5 83b7abc3e903209802a772a4da1b7879 show_ssl_link-2.2-1.2.8.tar.gz 13193
-RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d show_ssl_link-2.2-1.2.8.tar.gz 13193
-SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a show_ssl_link-2.2-1.2.8.tar.gz 13193
-MD5 486fb27a6ab306088603163160dbc8ca squirrelmail-1.4.11.tar.bz2 496370
-RMD160 c43f8f35665d4c40eb0fbcd40a2a52f3b881e334 squirrelmail-1.4.11.tar.bz2 496370
-SHA256 7c187933dd76fd0a13544851b17db12a9875f5d5eb2e2d6d16528b442fc20bb6 squirrelmail-1.4.11.tar.bz2 496370
-MD5 2b5d60f3845ef1cc51e5076cdf3994ae squirrelmail-decode-1.2.tar.bz2 333942
-RMD160 a217662f923a7e2129e293c6bf806dd0c21dab0b squirrelmail-decode-1.2.tar.bz2 333942
-SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26 squirrelmail-decode-1.2.tar.bz2 333942
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13-r1
index 90f9cf2957cd..6223dae42d99 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13-r1
@@ -10,9 +10,6 @@ SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisne
 MD5 53e89f4ad52a93909a8c7d66ba5b2b1b compatibility-2.0.9-1.0.tar.gz 31763
 RMD160 8c0d18b0f0ffab3b2cddcf943dfcbccffc0b16ee compatibility-2.0.9-1.0.tar.gz 31763
 SHA256 49c8dce4ee257fb36a97396c7cdd445d2b862659dc76c17048d96d2634d64019 compatibility-2.0.9-1.0.tar.gz 31763
-MD5 1e422dd77d455f8b1d07a66dc7d8aaed gpg-2.1.tar.gz 539562
-RMD160 aeecb1ae1d2021677c19923532e94f9d81794c57 gpg-2.1.tar.gz 539562
-SHA256 639aef199f9ccd96817f8c04b5d130f1206e5181204915923ee3d0d420459573 gpg-2.1.tar.gz 539562
 MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
 RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r6 b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r7
index 13f6696ee3bc..e71416f7fccb 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r6
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r7
@@ -10,9 +10,6 @@ SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisne
 MD5 b7a19451b104480fc01f75f39d056cd0 compatibility-2.0.8-1.0.tar.gz 32254
 RMD160 14060c2f6a1d7f2fafc753a57a52d9dc0a333472 compatibility-2.0.8-1.0.tar.gz 32254
 SHA256 d3cde09dee0470091d651fdc907f80ff16f3189482beed822e421f2b3283d4f6 compatibility-2.0.8-1.0.tar.gz 32254
-MD5 1e422dd77d455f8b1d07a66dc7d8aaed gpg-2.1.tar.gz 539562
-RMD160 aeecb1ae1d2021677c19923532e94f9d81794c57 gpg-2.1.tar.gz 539562
-SHA256 639aef199f9ccd96817f8c04b5d130f1206e5181204915923ee3d0d420459573 gpg-2.1.tar.gz 539562
 MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
 RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild
deleted file mode 100644
index 3df32aa9aace..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild,v 1.2 2008/01/10 17:06:36 alonbl Exp $
-
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.9-1.0
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.3-1.2.8
-SHOWSSL_VER=2.2-1.2.8
-LOCALES_VER=1.4.9-20070106
-DECODING_VER=1.2
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
-
-	cd ${S}
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd ${S}/plugins
-
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.sample.php secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd ${S} &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd ${S}
-	use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto compatibility
-	for doc in plugins/compatibility/INSTALL plugins/compatibility/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto admin_add
-	for doc in plugins/admin_add/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto retrieveuserdata
-	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	if use filter; then
-		docinto amavisnewsql
-		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use crypt; then
-		docinto gpg
-		for doc in plugins/gpg/README plugins/gpg/README.txt plugins/gpg/INSTALL plugins/gpg/INSTALL.txt plugins/gpg/TODO; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ldap; then
-		rm plugins/ldapuserdata/README
-		docinto ldapuserdata
-		for doc in plugins/ldapuserdata/doc/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ssl; then
-		docinto secure_login
-		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-
-		docinto show_ssl_link
-		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	cp ${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php ${D}${MY_HTDOCSDIR}/functions/decode
-
-	# Identify the configuration files that this app uses
-	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
-	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use crypt && configs="${configs} plugins/gpg/gpg_local_prefs.txt"
-	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
-	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
-
-	for file in ${configs}; do
-		webapp_configfile ${MY_HTDOCSDIR}/${file}
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.13.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
index b2f30cd7b188..58f8b1a4ae32 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.13.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13.ebuild,v 1.2 2008/01/10 17:06:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild,v 1.1 2008/01/12 02:40:39 eradicator Exp $
 
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
+IUSE="ldap spell ssl filter mysql postgres nls"
 
 inherit webapp eutils
 
@@ -13,7 +13,6 @@ COMPATIBILITY_VER=2.0.9-1.0
 USERDATA_VER=0.9-1.4.0
 ADMINADD_VER=0.1-1.4.0
 AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.3-1.2.8
 SHOWSSL_VER=2.2-1.2.8
@@ -32,7 +31,6 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
 	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
 	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
 
@@ -45,7 +43,6 @@ DEPEND=""
 
 RDEPEND="virtual/php
 	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
 	ldap? ( net-nds/openldap )
 	spell? ( || ( app-text/aspell app-text/ispell ) )
 	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
@@ -77,9 +74,6 @@ src_unpack() {
 		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
 		mv amavisnewsql/config.php.dist amavisnewsql/config.php
 
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
 	use ldap &&
 		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
 		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
@@ -94,9 +88,6 @@ src_unpack() {
 	use nls &&
 		cd ${S} &&
 		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd ${S}
-	use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
 }
 
 src_compile() {
@@ -143,14 +134,6 @@ src_install() {
 		done
 	fi
 
-	if use crypt; then
-		docinto gpg
-		for doc in plugins/gpg/README plugins/gpg/README.txt plugins/gpg/INSTALL plugins/gpg/INSTALL.txt plugins/gpg/TODO; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
 	if use ldap; then
 		rm plugins/ldapuserdata/README
 		docinto ldapuserdata
@@ -183,7 +166,6 @@ src_install() {
 	# Identify the configuration files that this app uses
 	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
 	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use crypt && configs="${configs} plugins/gpg/gpg_local_prefs.txt"
 	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
 	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
 
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1-r6.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
index c476cf4947ea..4048bc394e85 100644
--- a/mail-client/squirrelmail/squirrelmail-1.5.1-r6.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r6.ebuild,v 1.6 2008/01/10 17:06:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild,v 1.1 2008/01/12 02:40:39 eradicator Exp $
 
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
+IUSE="ldap spell ssl filter mysql postgres nls"
 
 inherit webapp eutils
 
@@ -13,7 +13,6 @@ COMPATIBILITY_VER=2.0.8-1.0
 USERDATA_VER=0.9-1.4.0
 ADMINADD_VER=0.1-1.4.0
 AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.3-1.2.8
 SHOWSSL_VER=2.2-1.2.8
@@ -32,7 +31,6 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
 	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
 	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
 
@@ -45,7 +43,6 @@ DEPEND=""
 
 RDEPEND="virtual/php
 	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
 	ldap? ( net-nds/openldap )
 	spell? ( || ( app-text/aspell app-text/ispell ) )
 	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
@@ -95,9 +92,6 @@ src_unpack() {
 		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
 		mv amavisnewsql/config.php.dist amavisnewsql/config.php
 
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
 	use ldap &&
 		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
 		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
@@ -112,9 +106,6 @@ src_unpack() {
 	use nls &&
 		cd ${S} &&
 		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd ${S}
-	use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
 }
 
 src_compile() {