punt security vulnerable versions

(Portage version: 2.1_rc3)
 (Signed Manifest commit)

9 files changed, 14 insertions, 608 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 8d366802283f..e700ffbeaa0b 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,11 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnupg-1.4-emptytrustpackets.patch 611 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 SHA1 5de97cdd26d155132c828db89b28cd37e9f03aad SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689
 MD5 c0b3223dbc599c2da7707cdae2b3683a files/gnupg-1.4-emptytrustpackets.patch 611
 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 files/gnupg-1.4-emptytrustpackets.patch 611
 SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689 files/gnupg-1.4-emptytrustpackets.patch 611
-AUX gnupg-1.4.2-badruman.patch 463 RMD160 d45ba287a2254380b379191afaec315bd278af57 SHA1 73fb4541f21e01b962fedd6c5cbd643372fb74ec SHA256 d2e5f0d993ada9683991553eca4c40935d399572226cc59a2fd0a2cf0972be7e
-MD5 e893ac3e7a6b11ab9806e16d3a8582fd files/gnupg-1.4.2-badruman.patch 463
-RMD160 d45ba287a2254380b379191afaec315bd278af57 files/gnupg-1.4.2-badruman.patch 463
-SHA256 d2e5f0d993ada9683991553eca4c40935d399572226cc59a2fd0a2cf0972be7e files/gnupg-1.4.2-badruman.patch 463
 AUX gnupg-1.4.2-jari.patch 370 RMD160 93e4099381de6cefadacf28ffd170b3cd5585c9f SHA1 6d8527bd0080d63ea851780a5394e0fd6eb00183 SHA256 d244d5d6f9f9e01f0cad2577d23c506f11e073210efbd48702ab62847cc60e73
 MD5 c23d51ccf048f10b5e8b10b45570c13a files/gnupg-1.4.2-jari.patch 370
 RMD160 93e4099381de6cefadacf28ffd170b3cd5585c9f files/gnupg-1.4.2-jari.patch 370
@@ -18,18 +17,6 @@ AUX gnupg-1.4.2-mpicoder.patch 991 RMD160 72d876fdec86f491b729ccaf95be9d0d1053a8
 MD5 fb96d149b5fc7dacc041dda2a57b2315 files/gnupg-1.4.2-mpicoder.patch 991
 RMD160 72d876fdec86f491b729ccaf95be9d0d1053a8f6 files/gnupg-1.4.2-mpicoder.patch 991
 SHA256 af1c3a0420546226eaa420728a06e9d8eb74e73f17cf4c350aeaebdfdc2bed0b files/gnupg-1.4.2-mpicoder.patch 991
-AUX gnupg-1.4.2-selftest.patch 1358 RMD160 7eeca9456366fbc9717de8becb3f42e9230d4b66 SHA1 7b48a7e651186076dd0d3cfceff12b32037c1e20 SHA256 ee99cdee58e519311b4b372595ce99e5da1e38ace8d5a60bf1394937f3e53495
-MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
-RMD160 7eeca9456366fbc9717de8becb3f42e9230d4b66 files/gnupg-1.4.2-selftest.patch 1358
-SHA256 ee99cdee58e519311b4b372595ce99e5da1e38ace8d5a60bf1394937f3e53495 files/gnupg-1.4.2-selftest.patch 1358
-AUX gnupg-1.4.2.1-badruman.patch 558 RMD160 a96b834dd0bfeeb7b6086248f8bef65ba8830aa2 SHA1 46383c13b2cb5c1ea1bd9357d18fb0775ede0b04 SHA256 0b924dce1e5f92f54d52c8f228b8763d674f8f8055d6a81e221774c9ab79bab6
-MD5 af68eb5d9d81d48514f170f580d9e83d files/gnupg-1.4.2.1-badruman.patch 558
-RMD160 a96b834dd0bfeeb7b6086248f8bef65ba8830aa2 files/gnupg-1.4.2.1-badruman.patch 558
-SHA256 0b924dce1e5f92f54d52c8f228b8763d674f8f8055d6a81e221774c9ab79bab6 files/gnupg-1.4.2.1-badruman.patch 558
-AUX gnupg-1.4.2.1-selftest.patch 1374 RMD160 87809c8f21da31868ad92721396e5a4ba96b4612 SHA1 a7be1936cbc46654df1026461317c2bae94232e8 SHA256 c6991fefaef0efee0fe6291a50e928f57024d93636955aa1754b8bcc10b633da
-MD5 e6487554fb0e281b61ae10aa5105dad9 files/gnupg-1.4.2.1-selftest.patch 1374
-RMD160 87809c8f21da31868ad92721396e5a4ba96b4612 files/gnupg-1.4.2.1-selftest.patch 1374
-SHA256 c6991fefaef0efee0fe6291a50e928f57024d93636955aa1754b8bcc10b633da files/gnupg-1.4.2.1-selftest.patch 1374
 AUX gnupg-1.4.2.2-badruman.patch 558 RMD160 11954ae9fd632244781877c00b2531c6eea32583 SHA1 dc81d6d202207177756f35020f583b6895615af3 SHA256 6cdb944d17df449f2cdce1a255c6fd83e1f4a34edd4d6e5c691bcc1d3c418257
 MD5 04c1fed4cbc17d814bbdbf09cc1d9000 files/gnupg-1.4.2.2-badruman.patch 558
 RMD160 11954ae9fd632244781877c00b2531c6eea32583 files/gnupg-1.4.2.2-badruman.patch 558
@@ -63,21 +50,11 @@ MD5 f7c457e0e98e73e3b29bb770c45dd47c files/gnupg-1.9.20-fbsd.patch 901
 RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115 files/gnupg-1.9.20-fbsd.patch 901
 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.1.tar.bz2 3030527 RMD160 5e04b3d6a9f683772916b1686edaddadd8afbb98 SHA1 1c0306ade25154743d6f6f9ac05bee74c55c6eda SHA256 df58e9970727306e28dbe3fcadf6cbff1b00abbee3d9c4ac41e2ed4a0a6353b4
 DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA1 f5559ddb004e0638f6bd9efe2bac00134c5065ba SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
-DIST gnupg-1.4.2.tar.bz2 2891177 RMD160 000e67769325a418553845be581de4fa3be0e88e SHA1 6eda5b090f9f1ac0da5e8b545e2667220a0e89ca SHA256 2e59787afe23102ebd8b05d32ce6abf165d2035958b200c2e330329c0a98b892
 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.9.20.tar.bz2 1810059 RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 SHA1 557be26c21c114a3b345ce6b177fcb088883f827 SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
-EBUILD gnupg-1.4.2-r3.ebuild 6872 RMD160 07ee3dc77ad9a0465b1beea4409be8139fec0205 SHA1 ff2c08e554579563b02c9c21f0c9cf4e3a6b152e SHA256 0f6a7801b4dc89e52646ffb7039530a0776e9929e65ac0a4c49bd820c69f0800
-MD5 7704ccabfdf30bc1a86ad81b8449abec gnupg-1.4.2-r3.ebuild 6872
-RMD160 07ee3dc77ad9a0465b1beea4409be8139fec0205 gnupg-1.4.2-r3.ebuild 6872
-SHA256 0f6a7801b4dc89e52646ffb7039530a0776e9929e65ac0a4c49bd820c69f0800 gnupg-1.4.2-r3.ebuild 6872
-EBUILD gnupg-1.4.2.1.ebuild 6958 RMD160 e97c070c3c2ca4ccbb0022f6319115cd100573af SHA1 4aabb8295c0f0d5039dff7944e94938fa6d9a0aa SHA256 bd984e712a133c5df6be76c2362e3d2b81df1f5f4dc76cc32438a17e5598f3a0
-MD5 55a78ad610605f21b240925858409b10 gnupg-1.4.2.1.ebuild 6958
-RMD160 e97c070c3c2ca4ccbb0022f6319115cd100573af gnupg-1.4.2.1.ebuild 6958
-SHA256 bd984e712a133c5df6be76c2362e3d2b81df1f5f4dc76cc32438a17e5598f3a0 gnupg-1.4.2.1.ebuild 6958
 EBUILD gnupg-1.4.2.2.ebuild 7051 RMD160 2514b7622efac0ed018295131ccf0cdc2adf5213 SHA1 bbe43563923199bbc3a0700b9109ee2c67713fce SHA256 28109c5253fd126ff83e4703d2fc92e360d530a34a0ddd2dbc7636a7cb5e77b3
 MD5 89d58e8a7c3eedf2660c73a6784a5871 gnupg-1.4.2.2.ebuild 7051
 RMD160 2514b7622efac0ed018295131ccf0cdc2adf5213 gnupg-1.4.2.2.ebuild 7051
@@ -90,20 +67,14 @@ EBUILD gnupg-1.9.20-r3.ebuild 2753 RMD160 b1e3ae5238973eb1f5257cbdf908255b6ff139
 MD5 c2bb9b7c41307afbbfdc84cf246a9bcb gnupg-1.9.20-r3.ebuild 2753
 RMD160 b1e3ae5238973eb1f5257cbdf908255b6ff1394b gnupg-1.9.20-r3.ebuild 2753
 SHA256 7f0f02a67bef4aed4d11447f1088c2b8ca308a31e9a56d415583f4b83fa05cf2 gnupg-1.9.20-r3.ebuild 2753
-MISC ChangeLog 30983 RMD160 7d0e02084bd74894f1918f1d0dd7d7d0ce7b1c11 SHA1 6b4274ae6566efc01f4089855dcca4a555530218 SHA256 0e961882b6ff331919af2ec55b761fe371a2c57588dddc25e02c748b7034fc14
-MD5 008c3b761cfe8b1f08bb23d4a61f6745 ChangeLog 30983
-RMD160 7d0e02084bd74894f1918f1d0dd7d7d0ce7b1c11 ChangeLog 30983
-SHA256 0e961882b6ff331919af2ec55b761fe371a2c57588dddc25e02c748b7034fc14 ChangeLog 30983
+MISC ChangeLog 31276 RMD160 060b406e8b60880fb0d3ff77b702b596dc21c2f1 SHA1 562aed4ec36cf366fb140d82e6a21dce8ad9b1d1 SHA256 bb6ef3c1148411b74ec04e97b8cf721f65d0fdb79011735267d1af83ab12fd62
+MD5 7fcfcdab581682d5e5b2e52537d64e74 ChangeLog 31276
+RMD160 060b406e8b60880fb0d3ff77b702b596dc21c2f1 ChangeLog 31276
+SHA256 bb6ef3c1148411b74ec04e97b8cf721f65d0fdb79011735267d1af83ab12fd62 ChangeLog 31276
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata.xml 481
-MD5 ca14e5c5b9c574a76b5f8f11d7f28d07 files/digest-gnupg-1.4.2-r3 708
-RMD160 29b5864c7ef68cae8432dda394c849e631f33d14 files/digest-gnupg-1.4.2-r3 708
-SHA256 1493a2a8c5595c051a61858446e1e9dca2ef6f477f1f69fd57ed246b446c8671 files/digest-gnupg-1.4.2-r3 708
-MD5 fbbb24e075ebcebdd93604768728c725 files/digest-gnupg-1.4.2.1 714
-RMD160 5861e533efaaaeedd4294a1c7cf07ae128c5e99d files/digest-gnupg-1.4.2.1 714
-SHA256 5de7f5bb591ca81dea5c409d0875f1f10f602d15318d391bf15c688e4a3cdbe4 files/digest-gnupg-1.4.2.1 714
 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
@@ -113,3 +84,10 @@ SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/di
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEe2u8mdTrptrqvGERAmuLAJwMti754qK7EJcIRzueGwEovRRTwACeLdlz
+1n0wx7DWOjlQhntomYpyPzE=
+=1MGR
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r3 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r3
deleted file mode 100644
index d42fb59f99a1..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-MD5 c7afd50c7d01fcfada229326b3958404 gnupg-1.4.2.tar.bz2 2891177
-RMD160 000e67769325a418553845be581de4fa3be0e88e gnupg-1.4.2.tar.bz2 2891177
-SHA256 2e59787afe23102ebd8b05d32ce6abf165d2035958b200c2e330329c0a98b892 gnupg-1.4.2.tar.bz2 2891177
-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.2.1 b/app-crypt/gnupg/files/digest-gnupg-1.4.2.1
deleted file mode 100644
index 3ce9a2771f56..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-MD5 2d59ed50d92f69994dbfbe00fe1612e4 gnupg-1.4.2.1.tar.bz2 3030527
-RMD160 5e04b3d6a9f683772916b1686edaddadd8afbb98 gnupg-1.4.2.1.tar.bz2 3030527
-SHA256 df58e9970727306e28dbe3fcadf6cbff1b00abbee3d9c4ac41e2ed4a0a6353b4 gnupg-1.4.2.1.tar.bz2 3030527
-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/gnupg-1.4.2-badruman.patch b/app-crypt/gnupg/files/gnupg-1.4.2-badruman.patch
deleted file mode 100644
index 4dfd2456fafc..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.2-badruman.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnupg-1.4.2/doc/Makefile.in.orig	2005-11-23 07:00:19.000000000 +1100
-+++ gnupg-1.4.2/doc/Makefile.in	2005-11-23 07:00:43.000000000 +1100
-@@ -280,7 +280,7 @@
-              HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
-              TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
- 
--man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1
-+man_MANS = gpg.1 gpgv.1 gnupg.7
- info_TEXINFOS = gpg.texi gpgv.texi
- 
- # Need this to avoid building of dvis with automake 1.4
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.2-selftest.patch
deleted file mode 100644
index 17eef4377c53..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.2-selftest.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --exclude='*~' -Naur gnupg-1.4.2.orig/checks/Makefile.in gnupg-1.4.2/checks/Makefile.in
---- gnupg-1.4.2.orig/checks/Makefile.in	2005-08-02 21:45:07.000000000 -0300
-+++ gnupg-1.4.2/checks/Makefile.in	2005-08-02 21:46:09.000000000 -0300
-@@ -517,9 +517,11 @@
- 
- ./gpg_dearmor:
- 	echo '#!/bin/sh' >./gpg_dearmor
--	echo "../g10/gpg --no-options --no-greeting \
-+	echo "../g10/gpg --no-options --no-greeting --homedir . \
-              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
- 	chmod 755 ./gpg_dearmor
-+	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
-+	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
- 
- ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
- 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
-diff --exclude='*~' -Naur gnupg-1.4.2.orig/g10/openfile.c gnupg-1.4.2/g10/openfile.c
---- gnupg-1.4.2.orig/g10/openfile.c	2005-08-02 21:45:07.000000000 -0300
-+++ gnupg-1.4.2/g10/openfile.c	2005-08-02 21:45:31.000000000 -0300
-@@ -399,8 +399,10 @@
-      * To cope with HOME, we do compare only the suffix if we see that
-      * the default homedir does start with a tilde.
-      */
-+#ifndef ENABLE_SELINUX_HACKS
-     if( opt.dry_run || opt.no_homedir_creation )
- 	return;
-+#endif
- 
-     if ( ( *defhome == '~'
-            && ( strlen(fname) >= strlen (defhome+1)
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.1-badruman.patch b/app-crypt/gnupg/files/gnupg-1.4.2.1-badruman.patch
deleted file mode 100644
index 596c973e74e4..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.2.1-badruman.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude='*~' -Naur gnupg-1.4.2.1.orig/doc/Makefile.in gnupg-1.4.2.1/doc/Makefile.in
---- gnupg-1.4.2.1.orig/doc/Makefile.in	2006-02-15 13:43:48.000000000 -0200
-+++ gnupg-1.4.2.1/doc/Makefile.in	2006-02-15 13:45:11.000000000 -0200
-@@ -280,7 +280,7 @@
-              HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
-              TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
- 
--man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1
-+man_MANS = gpg.1 gpgv.1 gnupg.7
- info_TEXINFOS = gpg.texi gpgv.texi
- 
- # Need this to avoid building of dvis with automake 1.4
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.1-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.2.1-selftest.patch
deleted file mode 100644
index 1423d799a8f4..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.2.1-selftest.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --exclude='*~' -Naur gnupg-1.4.2.1.orig/checks/Makefile.in gnupg-1.4.2.1/checks/Makefile.in
---- gnupg-1.4.2.1.orig/checks/Makefile.in	2006-02-15 13:38:28.000000000 -0200
-+++ gnupg-1.4.2.1/checks/Makefile.in	2006-02-15 13:39:25.000000000 -0200
-@@ -517,9 +517,11 @@
- 
- ./gpg_dearmor:
- 	echo '#!/bin/sh' >./gpg_dearmor
--	echo "../g10/gpg --no-options --no-greeting \
-+	echo "../g10/gpg --no-options --no-greeting --homedir . \
-              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
- 	chmod 755 ./gpg_dearmor
-+	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
-+	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
- 
- ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
- 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
-diff --exclude='*~' -Naur gnupg-1.4.2.1.orig/g10/openfile.c gnupg-1.4.2.1/g10/openfile.c
---- gnupg-1.4.2.1.orig/g10/openfile.c	2006-02-15 13:38:28.000000000 -0200
-+++ gnupg-1.4.2.1/g10/openfile.c	2006-02-15 13:40:19.000000000 -0200
-@@ -399,8 +399,10 @@
-      * To cope with HOME, we do compare only the suffix if we see that
-      * the default homedir does start with a tilde.
-      */
-+#ifndef ENABLE_SELINUX_HACKS
-     if( opt.dry_run || opt.no_homedir_creation )
- 	return;
-+#endif
- 
-     if ( ( *defhome == '~'
-            && ( strlen(fname) >= strlen (defhome+1)
diff --git a/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild
deleted file mode 100644
index 3722e692ec46..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild
+++ /dev/null
@@ -1,237 +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.2-r3.ebuild,v 1.15 2006/02/17 01:08:01 vanquirius Exp $
-
-inherit eutils flag-o-matic linux-info
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.0
-
-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"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard static usb zlib X"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/libc
-	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
-	get_running_version
-
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Jari's patch to boost iterated key setup by factor of 128
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-jari.patch
-
-	if use idea; then
-		ewarn "Please read http://www.gnupg.org/why-not-idea.html"
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		# this trickery is because the only reject in the 1.4.0 patch is the
-		# version number!
-		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
-			einfo "Tweaking PV in ECC patch"
-			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
-		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
-	fi
-
-	# maketest fix
-	epatch ${FILESDIR}/${P}-selftest.patch
-
-	# install RU man page in right location
-	epatch ${FILESDIR}/${P}-badruman.patch
-
-	cd ${S}
-	# keyserver fix
-	epatch ${FILESDIR}/${P}-keyserver.patch
-
-	epatch ${FILESDIR}/${P}-mpicoder.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
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	use sparc || myconf="${myconf} --enable-m-guard"
-
-	append-ldflags $(bindnow-flags)
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-	# 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-sha512 \
-		--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
-
-	# caps support makes life easier
-	if ! use caps && kernel_is lt 2 6 9
-	then
-		ewarn "installing gpg suid for memory space protection"
-		fperms u+s,go-r /usr/bin/gpg
-	fi
-
-	# 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 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/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.2.1.ebuild b/app-crypt/gnupg/gnupg-1.4.2.1.ebuild
deleted file mode 100644
index 172c0ab6b71a..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.2.1.ebuild
+++ /dev/null
@@ -1,234 +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.2.1.ebuild,v 1.13 2006/04/23 05:31:51 dragonheart Exp $
-
-inherit eutils flag-o-matic linux-info
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.0
-
-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"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard static usb zlib X"
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/libc
-	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.2-jari.patch
-
-	if use idea; then
-		ewarn "Please read http://www.gnupg.org/why-not-idea.html"
-		mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		# this trickery is because the only reject in the 1.4.0 patch is the
-		# version number!
-		local eccpatch="${WORKDIR}"/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
-			einfo "Tweaking PV in ECC patch"
-			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
-		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
-	fi
-
-	# maketest fix
-	epatch "${FILESDIR}"/${PN}-1.4.2.1-selftest.patch
-
-	# install RU man page in right location
-	epatch "${FILESDIR}"/${PN}-1.4.2.1-badruman.patch
-
-	cd "${S}"
-	# keyserver fix
-	epatch "${FILESDIR}"/${PN}-1.4.2-keyserver.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-mpicoder.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
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	use sparc || myconf="${myconf} --enable-m-guard"
-
-	append-ldflags $(bindnow-flags)
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-	# 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-sha512 \
-		--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/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
-}