smartcard improvments as per bug #147361. cleaned out a few versions too

Package-Manager: portage-2.1.2_pre1

9 files changed, 15 insertions, 837 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 910294b3fdf9..29824cd07820 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -63,12 +63,9 @@ RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115 files/gnupg-1.9.20-fbsd.patch 90
 SHA256 049c13bf96998298c8ff74e62ab1f112357d8e0efce2da8ae8daa11cf1a81eb3 files/gnupg-1.9.20-fbsd.patch 901
 DIST gnupg-1.4.0-ecc0.1.6.diff.bz2 16703 RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d SHA1 cf868cfc93951b5ee662ef8ce52e66338013a7a8 SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5
 DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA1 f5559ddb004e0638f6bd9efe2bac00134c5065ba SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
-DIST gnupg-1.4.3-ecc0.1.6.diff.bz2 18138 RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 SHA1 08baa8535da8a6317dd24be50f374a616be7ed3e SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0
-DIST gnupg-1.4.3.tar.bz2 3114088 RMD160 f6d328785f41b74f97d25305c6fe95ad45bb70a5 SHA1 9e96b36e4f4d1e8bc5028c99fac674482cbdb370 SHA256 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6
 DIST gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a SHA1 15831b5d4cbccdca3c005199d510700ee862fbc5 SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be
 DIST gnupg-1.4.4.tar.bz2 3047120 RMD160 b3807b3cf4fc577bf071261eff787c481bd4e0ca SHA1 3414d67f22973576f31e354f44859bafbccb7eee SHA256 d2cafed0a8cde831bdc25218d8b26d4aa373e36d0e0ecfccadf4ca810259ee08
 DIST gnupg-1.4.5.tar.bz2 3089617 RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5 SHA1 553fefe0da5a91108dd9468e381faf9487754f9a SHA256 f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805
-DIST gnupg-1.4.5rc1.tar.bz2 3090481 RMD160 6b775f55899894e3397229c17372a9f4afbcbee4 SHA1 97a3d5d05989226ef3d545a638402dca5c54ed29 SHA256 057b0598c198db3e0ee5b597128522f9dfb7736401feacbabbf7511127921cf0
 DIST gnupg-1.9.20.tar.bz2 1810059 RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 SHA1 557be26c21c114a3b345ce6b177fcb088883f827 SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
@@ -76,14 +73,6 @@ EBUILD gnupg-1.4.2.2.ebuild 7080 RMD160 ad87f82e5a35536cd4bc882efab39dcedebf6b5b
 MD5 90be1fab1a5b3ad1ec357aa5fba83c72 gnupg-1.4.2.2.ebuild 7080
 RMD160 ad87f82e5a35536cd4bc882efab39dcedebf6b5b gnupg-1.4.2.2.ebuild 7080
 SHA256 de58d9fbda293860a1917eeffcf8a0d50d55d3d53e544c1aa69c40a5cca4202d gnupg-1.4.2.2.ebuild 7080
-EBUILD gnupg-1.4.3-r1.ebuild 6505 RMD160 12e86e4048fdfa977156bfc982a2d15e11efb7a8 SHA1 2769acb70da6d48d87004ed6513eee349f459972 SHA256 fa8d9c0c7694b3583fc815aad7a3cafe94620deefc931793ae1b705c98eb9b3b
-MD5 1728ec6174550c0f363e37e389db2748 gnupg-1.4.3-r1.ebuild 6505
-RMD160 12e86e4048fdfa977156bfc982a2d15e11efb7a8 gnupg-1.4.3-r1.ebuild 6505
-SHA256 fa8d9c0c7694b3583fc815aad7a3cafe94620deefc931793ae1b705c98eb9b3b gnupg-1.4.3-r1.ebuild 6505
-EBUILD gnupg-1.4.3.ebuild 6409 RMD160 4c4b6a92555fc0c5c0384ab0b64a5f392a9f6aa8 SHA1 e606cfa7499b17d4a47536d014f1fb3b759076ef SHA256 a90081dffcdb6e61738f7c6aaeccc444807d296fefe9c5ab2fe0eca6158b6d9d
-MD5 6930272454b36f7abcb1bc8052f91737 gnupg-1.4.3.ebuild 6409
-RMD160 4c4b6a92555fc0c5c0384ab0b64a5f392a9f6aa8 gnupg-1.4.3.ebuild 6409
-SHA256 a90081dffcdb6e61738f7c6aaeccc444807d296fefe9c5ab2fe0eca6158b6d9d gnupg-1.4.3.ebuild 6409
 EBUILD gnupg-1.4.4.ebuild 6674 RMD160 6368ca01586daa272fbb8695d417d77cbe5957a3 SHA1 6ad41d6c5abdc33d4d48f917d93c870f04336926 SHA256 c4901ef7d368055d314fdcb50ffdcba8739f1eaaaeaf5d00a53ec03884353585
 MD5 5268693d358db789b9486d21f71727d6 gnupg-1.4.4.ebuild 6674
 RMD160 6368ca01586daa272fbb8695d417d77cbe5957a3 gnupg-1.4.4.ebuild 6674
@@ -92,26 +81,22 @@ EBUILD gnupg-1.4.5.ebuild 6597 RMD160 0b6552a883936b63b4822301b3753a0331d3f319 S
 MD5 73e045753333164a4d29d6a4808c2aa4 gnupg-1.4.5.ebuild 6597
 RMD160 0b6552a883936b63b4822301b3753a0331d3f319 gnupg-1.4.5.ebuild 6597
 SHA256 cf1bf5cba2549ff3adeff03fba484c8c4f92a6c9c0c85874ead6a6eef6b5c2bc gnupg-1.4.5.ebuild 6597
-EBUILD gnupg-1.4.5_rc1.ebuild 6667 RMD160 e34b30a3191bce6198c7eeb402aea0b9e2d88b7e SHA1 151d2574c549d52c1ae5376b1a2e8ff5e7fe983f SHA256 9b01f270d35f3c3897980be5c9f691e0a21e50cc8c335bf809c81f7a56eb247e
-MD5 6fb749181384d54133080e47dcf2116c gnupg-1.4.5_rc1.ebuild 6667
-RMD160 e34b30a3191bce6198c7eeb402aea0b9e2d88b7e gnupg-1.4.5_rc1.ebuild 6667
-SHA256 9b01f270d35f3c3897980be5c9f691e0a21e50cc8c335bf809c81f7a56eb247e gnupg-1.4.5_rc1.ebuild 6667
 EBUILD gnupg-1.9.20-r3.ebuild 2792 RMD160 4bc5f813aa792d3abf5b693e5deeaa062c4dfc54 SHA1 f8725505bf72664c155b8fc61793948409c0c34d SHA256 737db0e5723f7fa2ea3391661398f54a690bccfff3ea27b091a1e5d6f47c0f78
 MD5 ecba452a5ba0921435c01c67d37bc6c8 gnupg-1.9.20-r3.ebuild 2792
 RMD160 4bc5f813aa792d3abf5b693e5deeaa062c4dfc54 gnupg-1.9.20-r3.ebuild 2792
 SHA256 737db0e5723f7fa2ea3391661398f54a690bccfff3ea27b091a1e5d6f47c0f78 gnupg-1.9.20-r3.ebuild 2792
-EBUILD gnupg-1.9.20-r4.ebuild 2881 RMD160 b60b8a078b3726d9a1bc69238839bb77c8f936ff SHA1 c579621ee83a04b5a064d2846a41f7652d27c8ac SHA256 137768c47bd6bcf96e499bd07fc0b978ceedd521256f68c8eb6d083f0f5be586
-MD5 a5743787cccf8e6be25206f230f4e9aa gnupg-1.9.20-r4.ebuild 2881
-RMD160 b60b8a078b3726d9a1bc69238839bb77c8f936ff gnupg-1.9.20-r4.ebuild 2881
-SHA256 137768c47bd6bcf96e499bd07fc0b978ceedd521256f68c8eb6d083f0f5be586 gnupg-1.9.20-r4.ebuild 2881
+EBUILD gnupg-1.9.21-r1.ebuild 2993 RMD160 55af4fdeb2b834fa6e7bb491822646a2a1e2c0c3 SHA1 e36584b8e552c2e64abbd33455fcdba62db713bb SHA256 abad7fd70566e42f9dab471bb3c234a0c7d27ddf5c92a4d58bcf1c509408c9d0
+MD5 de5ba9a62caf221aa3bc9e0feb824d32 gnupg-1.9.21-r1.ebuild 2993
+RMD160 55af4fdeb2b834fa6e7bb491822646a2a1e2c0c3 gnupg-1.9.21-r1.ebuild 2993
+SHA256 abad7fd70566e42f9dab471bb3c234a0c7d27ddf5c92a4d58bcf1c509408c9d0 gnupg-1.9.21-r1.ebuild 2993
 EBUILD gnupg-1.9.21.ebuild 3059 RMD160 7a3e028c5a71eaf6f3dcbf46bcbeafa206fdda39 SHA1 20f39ad1b9cabbe5a2ac19d469a0843072658cff SHA256 00ff03d5e6a754b16638f5d22bc7e954e26699ae4d206d9cc302a355431e1418
 MD5 c32f4a4200c4b61c404fc4cc332df83f gnupg-1.9.21.ebuild 3059
 RMD160 7a3e028c5a71eaf6f3dcbf46bcbeafa206fdda39 gnupg-1.9.21.ebuild 3059
 SHA256 00ff03d5e6a754b16638f5d22bc7e954e26699ae4d206d9cc302a355431e1418 gnupg-1.9.21.ebuild 3059
-MISC ChangeLog 35525 RMD160 67ce5938c86d348e5f64aa6cea8dbd74605f11f0 SHA1 985b9ccbab48180fc27bd75e7d1d4ca953569992 SHA256 5f6a6a7607a50a5142863cb667483502d5dadf9dc3e633fd20cf3ae1b85dfd83
-MD5 5654d970fd65f338be02e45b6519ca24 ChangeLog 35525
-RMD160 67ce5938c86d348e5f64aa6cea8dbd74605f11f0 ChangeLog 35525
-SHA256 5f6a6a7607a50a5142863cb667483502d5dadf9dc3e633fd20cf3ae1b85dfd83 ChangeLog 35525
+MISC ChangeLog 35794 RMD160 c1868a4f07c1a4752a44bd11164483fa0f11a28e SHA1 9ae12bf58fb19e3e85916cba0a52ed346802ba64 SHA256 56bfee6b762e2e62c338546a2f4f5ae67336d0b6ebd8a1ade78bc8c77c8554a0
+MD5 d7d1938c8bd445cdb68d0d5c86dbcd82 ChangeLog 35794
+RMD160 c1868a4f07c1a4752a44bd11164483fa0f11a28e ChangeLog 35794
+SHA256 56bfee6b762e2e62c338546a2f4f5ae67336d0b6ebd8a1ade78bc8c77c8554a0 ChangeLog 35794
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -119,34 +104,25 @@ SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata
 MD5 bc94c18c95c8b0e7f438a7f8bae67ee9 files/digest-gnupg-1.4.2.2 714
 RMD160 d63d0eb7227af8515715b2f16756d3289bc2cadd files/digest-gnupg-1.4.2.2 714
 SHA256 25fa4aa5eaea9962a865c2e6b0f123972c0111ee0999060b3aca8a17f087328f files/digest-gnupg-1.4.2.2 714
-MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3 708
-RMD160 9bfc71ad352871b75a329439caaff906a1c5397f files/digest-gnupg-1.4.3 708
-SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/digest-gnupg-1.4.3 708
-MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3-r1 708
-RMD160 9bfc71ad352871b75a329439caaff906a1c5397f files/digest-gnupg-1.4.3-r1 708
-SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/digest-gnupg-1.4.3-r1 708
 MD5 015c1f3fa570f190ba5c8e7d2da977cf files/digest-gnupg-1.4.4 708
 RMD160 9fc25fbc123c91aef099c7b427c66296ea3ede11 files/digest-gnupg-1.4.4 708
 SHA256 5122660ca270163601e13f1bef65ae7c02c413f4540aff26ff4931974c3fad27 files/digest-gnupg-1.4.4 708
 MD5 8f18ae380f06f5dd90d7992982200d25 files/digest-gnupg-1.4.5 708
 RMD160 bd8c14fcd3786d851d9a77b0a9aec639de6a5c23 files/digest-gnupg-1.4.5 708
 SHA256 d8f3903fe059e480b38d1602fd9efa409019129dfc9362acfe3e363375b9f90d files/digest-gnupg-1.4.5 708
-MD5 da42102a0baa5f514f3fea94f5689757 files/digest-gnupg-1.4.5_rc1 717
-RMD160 2d916949a9af9725b2abe6d7e121d199dfc53be0 files/digest-gnupg-1.4.5_rc1 717
-SHA256 836f57454b70ad9d5b706295afa96513f914991281a1a3415b3c86fcd54ee2fc files/digest-gnupg-1.4.5_rc1 717
 MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r3 244
 RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r3 244
 SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r3 244
-MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r4 244
-RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r4 244
-SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r4 244
 MD5 3a094d262f7870e0d3148bf61e353a31 files/digest-gnupg-1.9.21 244
 RMD160 85a121d64713e41d718ffaafc308776d580c0b9f files/digest-gnupg-1.9.21 244
 SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/digest-gnupg-1.9.21 244
+MD5 3a094d262f7870e0d3148bf61e353a31 files/digest-gnupg-1.9.21-r1 244
+RMD160 85a121d64713e41d718ffaafc308776d580c0b9f files/digest-gnupg-1.9.21-r1 244
+SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/digest-gnupg-1.9.21-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFDlKcamhnQswr0vIRArPnAKCp4Qe/+Mjr2fkPHfJed0QSZEFVWwCgu0mO
-1zmrHg8Qmi6HX1qh4JqGi+k=
-=FaNC
+iD8DBQFFFNvAmdTrptrqvGERAsorAJ0VM777/SStQkvdNx7Rd2NRVnSILQCePJIM
+tFnmVkSgzafwMtlKuBrhnoc=
+=2b9E
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.3 b/app-crypt/gnupg/files/digest-gnupg-1.4.3
deleted file mode 100644
index 1984012d6f4e..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 92dc69b6eb6ae62200e43f79dec3e0c4 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
-RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
-SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
-MD5 d237d8fe1c4afa379f56dbda0e0b40e4 gnupg-1.4.3.tar.bz2 3114088
-RMD160 f6d328785f41b74f97d25305c6fe95ad45bb70a5 gnupg-1.4.3.tar.bz2 3114088
-SHA256 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6 gnupg-1.4.3.tar.bz2 3114088
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
-SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.3-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.3-r1
deleted file mode 100644
index 1984012d6f4e..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.3-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 92dc69b6eb6ae62200e43f79dec3e0c4 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
-RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
-SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
-MD5 d237d8fe1c4afa379f56dbda0e0b40e4 gnupg-1.4.3.tar.bz2 3114088
-RMD160 f6d328785f41b74f97d25305c6fe95ad45bb70a5 gnupg-1.4.3.tar.bz2 3114088
-SHA256 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6 gnupg-1.4.3.tar.bz2 3114088
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
-SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.5_rc1 b/app-crypt/gnupg/files/digest-gnupg-1.4.5_rc1
deleted file mode 100644
index 43f0a224385d..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.5_rc1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0be9a69c1ff363e4ad671860a2b9c14f gnupg-1.4.4-ecc0.1.6.diff.bz2 16931
-RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a gnupg-1.4.4-ecc0.1.6.diff.bz2 16931
-SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be gnupg-1.4.4-ecc0.1.6.diff.bz2 16931
-MD5 13dd829ab7b2b6c8075e17982a228cd8 gnupg-1.4.5rc1.tar.bz2 3090481
-RMD160 6b775f55899894e3397229c17372a9f4afbcbee4 gnupg-1.4.5rc1.tar.bz2 3090481
-SHA256 057b0598c198db3e0ee5b597128522f9dfb7736401feacbabbf7511127921cf0 gnupg-1.4.5rc1.tar.bz2 3090481
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
-SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r4 b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r4
deleted file mode 100644
index ba3b6d7aa814..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
-RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 gnupg-1.9.20.tar.bz2 1810059
-SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/gnupg-1.4.3-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.3-r1.ebuild
deleted file mode 100644
index 63f86b39b0ec..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.3-r1.ebuild,v 1.3 2006/07/07 21:44:11 genstef Exp $
-
-inherit eutils flag-o-matic linux-info
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.3
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 curl ecc idea ldap nls readline selinux smartcard static usb zlib X linguas_ru"
-# IUSE+=caps
-
-#	caps? ( sys-libs/libcap )
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="!static? (
-		${COMMON_DEPEND}
-		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	)
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# fix bug #113474 - no compiled kernel needed now
-	if use kernel_linux; then
-	    get_running_version
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Jari's patch to boost iterated key setup by factor of 128
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-jari.patch
-
-	if use idea; then
-		ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html"
-		mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-	fi
-
-	# maketest fix
-	epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch
-
-	# install RU man page in right location
-	epatch "${FILESDIR}"/${PN}-1.4.3-badruman.patch
-
-	cd "${S}"
-	# keyserver fix
-	epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch
-
-	#  fix segfault of empty segfault packages - bug 129218
-	epatch "${FILESDIR}"/${PN}-1.4-emptytrustpackets.patch
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static &&append-ldflags -static
-
-	append-ldflags $(bindnow-flags)
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	#	$(use_with caps capabilities) \
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		--disable-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable static) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-noexecstack \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	make DESTDIR="${D}" install || die
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	# install RU documentation in right location
-	if use linguas_ru
-	then
-		cp doc/gpg.ru.1 ${T}/gpg.1
-		doman -i18n=ru ${T}/gpg.1
-	fi
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	fi
-}
-
-pkg_postinst() {
-	#if ! use kernel_linux || (! use caps && kernel_is lt 2 6 9); then
-	if ! use kernel_linux || kernel_is lt 2 6 9; then
-		chmod u+s,go-r ${ROOT}/usr/bin/gpg
-		einfo "gpg is installed suid root to make use of protected memory space"
-		einfo "This is needed in order to have a secure place to store your"
-		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	else
-		chmod u-s,go-r ${ROOT}/usr/bin/gpg
-	fi
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	#if use caps; then
-	#	einfo
-	#	ewarn "Capabilities code is experimental"
-	#fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.3.ebuild b/app-crypt/gnupg/gnupg-1.4.3.ebuild
deleted file mode 100644
index c5e223524020..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.3.ebuild,v 1.3 2006/07/07 21:44:11 genstef Exp $
-
-inherit eutils flag-o-matic linux-info
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.3
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard static usb zlib X linguas_ru"
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="!static? (
-		${COMMON_DEPEND}
-		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	)
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# fix bug #113474 - no compiled kernel needed now
-	if use kernel_linux; then
-	    get_running_version
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Jari's patch to boost iterated key setup by factor of 128
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-jari.patch
-
-	if use idea; then
-		ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html"
-		mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-	fi
-
-	# maketest fix
-	epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch
-
-	# install RU man page in right location
-	epatch "${FILESDIR}"/${PN}-1.4.3-badruman.patch
-
-	cd "${S}"
-	# keyserver fix
-	epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch
-
-	#  fix segfault of empty segfault packages - bug 129218
-	epatch "${FILESDIR}"/${PN}-1.4-emptytrustpackets.patch
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static &&append-ldflags -static
-
-	append-ldflags $(bindnow-flags)
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		$(use_with caps capabilities) \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable static) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-noexecstack \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	make DESTDIR="${D}" install || die
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	# install RU documentation in right location
-	if use linguas_ru
-	then
-		cp doc/gpg.ru.1 ${T}/gpg.1
-		doman -i18n=ru ${T}/gpg.1
-	fi
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	fi
-}
-
-pkg_postinst() {
-	if ! use kernel_linux || (! use caps && kernel_is lt 2 6 9); then
-		chmod u+s,go-r ${ROOT}/usr/bin/gpg
-		einfo "gpg is installed suid root to make use of protected memory space"
-		einfo "This is needed in order to have a secure place to store your"
-		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	else
-		chmod u-s,go-r ${ROOT}/usr/bin/gpg
-	fi
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	if use caps; then
-		einfo
-		ewarn "Capabilities code is experimental"
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.5_rc1.ebuild b/app-crypt/gnupg/gnupg-1.4.5_rc1.ebuild
deleted file mode 100644
index 6ea11e9cdb2f..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.5_rc1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.5_rc1.ebuild,v 1.1 2006/08/01 00:51:26 dragonheart Exp $
-
-inherit eutils flag-o-matic linux-info
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.4
-MY_P=${P/_/}
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-#SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-SRC_URI="mirror://gnupg/alpha/gnupg/${MY_P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 curl ecc idea ldap nls readline selinux smartcard static usb zlib X linguas_ru"
-# IUSE+=caps
-
-#	caps? ( sys-libs/libcap )
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="!static? (
-		${COMMON_DEPEND}
-		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	)
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# fix bug #113474 - no compiled kernel needed now
-	if use kernel_linux; then
-	    get_running_version
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-
-	# Jari's patch to boost iterated key setup by factor of 128
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-jari.patch
-
-	if use idea; then
-		ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html"
-		mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		epatch "${FILESDIR}"/${P}-ecc-helper.patch
-		EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-	fi
-
-	# maketest fix
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch
-
-	# install RU man page in right location
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-badruman.patch
-
-	# keyserver fix
-	EPATCH_OPTS="-p1 -d ${S}"  epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch
-
-	cd "${S}"
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static &&append-ldflags -static
-
-	append-ldflags $(bindnow-flags)
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	#	$(use_with caps capabilities) \
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		--disable-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable static) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-noexecstack \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	make DESTDIR="${D}" install || die
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	exeinto /usr/libexec/gnupg
-	doexe tools/make-dns-cert
-
-	# install RU documentation in right location
-	if use linguas_ru
-	then
-		cp doc/gpg.ru.1 ${T}/gpg.1
-		doman -i18n=ru ${T}/gpg.1
-	fi
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	fi
-}
-
-pkg_postinst() {
-	#if ! use kernel_linux || (! use caps && kernel_is lt 2 6 9); then
-	if ! use kernel_linux || kernel_is lt 2 6 9; then
-		chmod u+s,go-r ${ROOT}/usr/bin/gpg
-		einfo "gpg is installed suid root to make use of protected memory space"
-		einfo "This is needed in order to have a secure place to store your"
-		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	else
-		chmod u-s,go-r ${ROOT}/usr/bin/gpg
-	fi
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	#if use caps; then
-	#	einfo
-	#	ewarn "Capabilities code is experimental"
-	#fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.9.20-r4.ebuild b/app-crypt/gnupg/gnupg-1.9.20-r4.ebuild
deleted file mode 100644
index 6d1e55a70063..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.20-r4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20-r4.ebuild,v 1.1 2006/06/15 00:09:14 robbat2 Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X gpg2-experimental ldap nls smartcard selinux"
-#IUSE+=caps
-
-COMMON_DEPEND="
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	smartcard? ( >=dev-libs/opensc-0.8.0 )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.13
-	>=dev-libs/libgpg-error-1.0
-	~dev-libs/libassuan-0.6.10
-	ldap? ( net-nds/openldap )"
-#	caps? ( sys-libs/libcap )"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	=app-crypt/gnupg-1.4*
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use smartcard && ! built_with_use dev-libs/opensc pcsc-lite ; then
-		sed -i -e 's:OPENSC_LIBS="\$OPENSC_LIBS -lpcsclite -lpthread":OPENSC_LIBS="\$OPENSC_LIBS -lopenct -lpthread":' \
-		acinclude.m4 || die "openct patching failed."
-		./autogen.sh
-	fi
-	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
-
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-	epatch "${FILESDIR}/${P}-fbsd-gcc41.patch"
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	#use caps || append-ldflags $(bindnow-flags)
-	append-ldflags $(bindnow-flags)
-
-	#$(use_with caps capabilities) \
-	econf \
-		--enable-agent \
-		--enable-symcryptrun \
-		$(use_enable gpg2-experimental gpg) \
-		--enable-gpgsm \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	#if ! use caps; then
-		use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
-		fperms u+s,go-r /usr/bin/gpg-agent
-	#fi
-}
-
-pkg_postinst() {
-	#if ! use caps; then
-	#	einfo "gpg is installed suid root to make use of protected memory space"
-	#	einfo "This is needed in order to have a secure place to store your"
-	#	einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	#fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}