Remove old.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

9 files changed, 15 insertions, 954 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 6d659946b2fe..e9358eaa3964 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.485 2013/08/19 16:55:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.486 2013/08/19 16:59:42 radhermit Exp $
+
+  19 Aug 2013; Tim Harder <radhermit@gentoo.org> -gnupg-1.4.13.ebuild,
+  -gnupg-1.4.13-r1.ebuild, -gnupg-2.0.19.ebuild, -gnupg-2.0.19-r1.ebuild,
+  -gnupg-2.0.19-r2.ebuild, -files/gnupg-2.0.19-support-sc-key-3072.patch,
+  -files/gnupg-2.0.19-texinfo-5.patch:
+  Remove old.
 
 *gnupg-2.0.21 (19 Aug 2013)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 381e62d62955..2429be8b3712 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,31 +2,22 @@
 Hash: SHA256
 
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
-AUX gnupg-2.0.19-support-sc-key-3072.patch 5734 SHA256 1002f8a3cb4128195c6b7ee00120603d4680f535b8d8c5dd9d68897ff3288bbe SHA512 f376a2d1564dd9c391e080f65dd2ba5a8e38d52fb51cf70e1c9f7feae2e3a3c2f819fe561ad51872cd3f35e1e3fad065c90282ffc7907bb6b9557f561b7ddac5 WHIRLPOOL f080725e86953dc183fdc81eb9fa503b2234a8aa60a0722282faea0c29045091f446699cb98f7f760c0d2a2ca710dda6f2d83bfe449d70e60017cd2095c43ca3
-AUX gnupg-2.0.19-texinfo-5.patch 1526 SHA256 7b8a2070a0cfa1cf8925620fdc12fc8fe5e77c262dfb8dc3e62b6c56b44ad87d SHA512 96a38fd95020a62abdfc18c391ef1dbc5da0e44f3c5e1fe4a3937d322e1ea34fd77efee72fa465c99fb7732e05225de1752b3a79c3255765762888b5d191bb74 WHIRLPOOL 6529d9be436ba42e4465412f73eea57d5932fc214a8297a88ea54f4dc75883427de2c4600e697d093831845eb8dd13115efcf175544914d3fa99b991bd7eabbe
-DIST gnupg-1.4.13.tar.bz2 3685873 SHA256 72a24dd318472f0c8f0d00ebe19fb4bcf43e30845bcc92a8ae43c810df295d5a SHA512 62c330e02c311206c653cbadf21783599362601f4375ecb32a5bc8ff3f5c64160d95d28555fe06d7fb612c3802c87e0be1d0a68d61b404fdfcecf3580f14b738 WHIRLPOOL 4ae940bda2cc713a387541101df3ff06753c4f701d5d53460af7118278ce5d9b8cd83dd15ea033de5ac15ec6f4a0e339621a359497f4c178c25bbdcc38763d12
 DIST gnupg-1.4.14.tar.bz2 3687929 SHA256 f2c4cd3ed6a5fb66cb369bf8160e53127712adfe41ebf965c0f02ab71d984413 SHA512 324b32807759c8a9c3587e1576ab1f5815918028f015dcff36e7ff1e8610996c89e4bc7af77385adc9359f21cc022642b971509698a81510a88085f5a268405f WHIRLPOOL c14a89171b2bf7a4b0934e67cf970325e394c38a05daa455c87327eaa13fea27e5cadbfcf693dedb5840b4a249b53457baf91ecd307ec66e11dfccbfe661e037
-DIST gnupg-2.0.19.tar.bz2 4187460 SHA256 efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622 SHA512 9bfc83ebca29ca8e3dde803ba494adb3c4e2fdcacbf33b5592764fe187dbe2433e04ff53734a9c3197358d559c1046098707089ddbea9fa63c849d48ce73ca51 WHIRLPOOL 026f9a8740322b951b256ec87fabb8a1b3ad2114208f52c2082b73b2193d1be8e276f0f526762bbebb04e612351162eb78c9c50eeb058e35fad9c4df1d7db540
 DIST gnupg-2.0.20.tar.bz2 4286191 SHA256 6e949b7f062cab8a3cf0910f91ecf04cabaad458c0aeeec66298651b8b04b79a SHA512 f4eec0ed3503f2aeecfa63af53b844b19ee4be596ea487dce69ec14189c8163652c932d0e657be147b1ca3d7dc8adf9cc1bc8067086fe0c51a3487d56df388c4 WHIRLPOOL a088aab347be7d2c83078eadc79387e705d048868800c8335574f0b0f7c7cd21d8dd620783f83c908075841144b6f8577db8838c99459edd2309fec836761f0d
 DIST gnupg-2.0.21.tar.bz2 4300604 SHA256 00df8902c7cef4d2440d36ca2a45985853eb36c34a4163bc995c3578030eeef5 SHA512 e31b7d9143462e4846111cdbcf0af9ad93fb1f5b9324a1c126c060e4cefb09d3c6b2f85e655d3960b5f21f09317cefd2c5b786e129efb62feab20f4b9a6770ba WHIRLPOOL 911d0122d6aa8bc883b192b47a785c323a0a5fb015ecc6cf08cd19a3d8f03a80b320555c8ebb6804b0a9841fa2b17b633be4f23b458e1778a73a583e4ba608cc
-EBUILD gnupg-1.4.13-r1.ebuild 3798 SHA256 6883c1614da054e9378dcce892befc85cefc6663f9e015d4002242a261caa3b7 SHA512 a482f8bcaf935a1a041394791fd5244fee2acfe3f6dc14de23b1ba46cb4330ad392aba2fa66bf6d31551aef1b65356bc3ef3cd151b0c497797ad592d2ea51a53 WHIRLPOOL 3eeab2cfcb379daaa7b7e6921ccc84c83f02db9bc5e094ee8cf302988c53fcefb94a57c7bc479df916450afbaa9a940f838daa652413d74309032516a4fadd78
-EBUILD gnupg-1.4.13.ebuild 4239 SHA256 926ecef683acf166bfc7ba9b7b232fb8b19b3e25b9a8cbabb1dd7d5ea7562f4b SHA512 f3c26c737a346bb352df018a9c3fbc645ee40a259ace2cb4d9429124a5d9e77b2d9e45810a7f1f16920b414c2d42b3da5cd88ba1d17e4bf4222d4507d9330dcc WHIRLPOOL 2b3fecbfb80daf95771f3c23dd8d9ea71229da28417bd0b6a6491b91675999aeb0a9bbdf658fa80279b5e343d74c30bbecd8002dbe4d42b39df00691d2dbd6ef
 EBUILD gnupg-1.4.14.ebuild 3761 SHA256 4be020e6d1202f937d8b3a59d297bdded0f78a9c1c9e44518080d9fb7bf8605e SHA512 695afc4e15ec18dc29343a2fb551f587ba00f6c8bb1a0122e94556cd5a138cfbc4db5b6a30ebbbf3287f05f580a39ce554d022f1acc467117fc68e9d54531762 WHIRLPOOL ca6f2e8c8d9f1df1f6391e503a48fdb6134cc4da2a851da5d18573a20313909d2357c1cc794f3e92c13d173b2373e059ecd9d091b18b0f01184d15fa1370f105
-EBUILD gnupg-2.0.19-r1.ebuild 4582 SHA256 44cfdd22b5a2697cfc8d91cd4a6dc5ba64dcfaf506b20b0560ccb58ce61f9a78 SHA512 bbe29c08c6ec1fc27d6ed87736eb4ffdc85802a5a4a5f976e7c2a8b953bb68e056dba3e9b16531f465dbd738922aeb48313db39d4f971b46f3d1335b93945574 WHIRLPOOL cda6bf962f7fdbe6af6af618b931d388b9e91cb015471b772ad78a0948e1c822e6ad9efc17af3d6587d28e562dcb1c9b6f9e2c6b140889b6595bbacb67332045
-EBUILD gnupg-2.0.19-r2.ebuild 4683 SHA256 af9e319c56147412b94e33e84dd3c2d3cfca3ddfd01716b5bdbf1d3644b49b91 SHA512 c45bce3095e84c8dcd71626c8d3b9f83c97ffb9d4073101e33a3959551a8d2b97e64bdbe952c877c0b33d67132d625441efdae2ee57b89a2fe62f8e6b7bae40c WHIRLPOOL 7d56104338e404f50f5fd8161febf2b9ed5638e5256e4d1567921c4982675ab472f09520e9ef92d90d9b3bdebd21e352b32cc43d0aa9d61b73772946ca169b5e
-EBUILD gnupg-2.0.19.ebuild 4472 SHA256 5a5159050703c2cc0831b6b6a7a42e6d1d9a92b3443e5039290fed2b7cfbc5b6 SHA512 48310f5582cf4a95cd20828a7e313bf7bca79e4edbef44ec4f95d048f1f9d7c932f469dc239827f38a3fd6a4b0c5c7624d3f338d8735525a877d623aeb5b0105 WHIRLPOOL 59a01c348c91268690cbc28706d635f511fef2faa2158446a915736652421abb123bf45c9598412b21c8d7b11b5635b55301ec5f44fedce0476eaab7d7e7fd8c
 EBUILD gnupg-2.0.20.ebuild 4574 SHA256 184e6a23b57a5c86300f5bd76b0eeed3b568a5bc9a06ae43210e1afce4c59fa7 SHA512 2e9682726ba32d27bb99060302960e3e8855718eb7a7a979c13dae2d3fb88216369ba3af690cff013110577359d830732159d2048dd9a9782828f63a3b1cdf3f WHIRLPOOL f2a9a3d767259073f3b6ddf8c97f053de9d3f57a09e6642f014ea4d0eae52bb7730fe1a4eb3dafaf0be627aa8008532859bf0d50853ff9ea520eb77b1a798bbc
 EBUILD gnupg-2.0.21.ebuild 4591 SHA256 3a68cb34b57916cefcff1652e6a9e92ec0926e1157a9b13869b935a62a71a695 SHA512 3089940b5e5d5e1311668f2eaa5a937f31aa9916df930b5debdc7b4764ff141423f92a539cb804495cccf22f174c1afc4a0f4c6b14812bb2cd84ab39c198ba2b WHIRLPOOL 942bb8e0edbef388bd3e0b6e4a325e1f8556bd37d5081cadf14aa483a9b06480ed34d32d20b59781d8697b8cbe88b3ac17f66c7b8580bc5e86fbe7ffd715f23b
-MISC ChangeLog 71931 SHA256 047a52ced9e8659a506b05abcc3d5c6f26d7a47df1e9d5b6d96771ea27166547 SHA512 aafadd3eac04292a7a4631a292cb04227b89c2d54cb505779dab5f8b78903d5716d9472a462fab703a05922138b8112444b4ce036e677d3ad30545f23d0797c3 WHIRLPOOL ea199842f6e9d1df06002f2ec58e44ecd9e3ce62106f73178265622e13fc50bc958e621e9e616f1b36eb6037864812cf8e65ebd2734fecd39e6de030e6c1b54d
+MISC ChangeLog 72204 SHA256 80a18a6152a51bbdaf7b71c6c64887f7fe27d03abc955af5bf4f6bfc4cd5d8bb SHA512 652d037ccda2a69cece89ff534ce4091dbb5c0e839cf0bd62700fd61b5af1e4268262efc8c6450d4fd653f117772fee73e788c8274b51564944c63bcd1a35a94 WHIRLPOOL 09e58ab4f2de0499e98ec07f2bb94cdde12672ab9dadc563abdcb6ecb14d32a523a7e01b5a8179d5f57d5cd3a39d9fe4d0d7f1bfcbeda66c8d473f3180b4df79
 MISC metadata.xml 1078 SHA256 6d0df2861d7b3fc7777f9c703b06f789a8e4e4d08a98b1f5f5cc661943a5b7e0 SHA512 2998315ea1dad11806385d84827189efb626620d6596bf51a67180567a5ed3cbcb5eea50de907477b93d876ce66fb7e944cce159fe29450a301cda9bdd76db87 WHIRLPOOL fc0761ee1950b067a4434192c22b3d516017b539694e3615f9429ad8b05ace449e8d9abf01086baf91eb93cb9ad4fe2c37467b0313ccaf0411a99be63a7440e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSEk4UAAoJEEqz6FtPBkyjzXkH/0Mpr5vpIFRKebCzMDt5Po12
-lUCdmSNWQA2pu+8zTiauHeNYFvveY4YAhp/nrEaFf+EDnXo2HeFA5xVwmseY1Aj9
-CEHpZ0lkSBgfzePGb2rBURoa+BV4la8bYzgRUrVw8rR+551KRWgJ+aHdLaGOaSs9
-xKwaMoqzrzQI0iq/Qu0uztn/TKvL+qvPlKwdnA9Z9v6KWkzJMaMWG7ub7TB2EF06
-PFwzfntvjTXGsVWSU//7nSWBHZBOtLckYJwKoLQkKTGBTNLVqOYipmnT3C/zKbHl
-Tuiekx8NpOe0hvjDrw5BH/lrAQGhWwHB7lJRty+E4tyW/oA+PguivpaopX0R9Fs=
-=w//o
+iQEcBAEBCAAGBQJSEk7/AAoJEEqz6FtPBkyjImoIAKudMprhkCz32FRl2KttNOYk
+4Fp+2FYYkWVxJAcctQDskKsPo6AvEc9NlSIJNfGQU/ls/10IXG68st8kx0IOanqd
++HKuVhY0yvR1n2FPz3wPhQkxrd93vYS0GKrpHqpnQfxVVX2EjLGi6gjd0Pd/bT34
+ZbRncIBmroTKpFiMFp1md20kJHCfcEvAqPr14CzLDFhljA7j6BCnLrPOLvN7B+Hl
+FcsSO19lMG0qaJUmAot9o+k42Mo/z4JLbWeiJtdmu/CwJyPBv36Q5iUOpMaII50X
+49W1MQD1ehmX2sjyEUqPxs0ZrGq0AMqUJMeSkbrY4z0IpeqoGMBN1hN5fNG2+Xo=
+=O3yA
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/gnupg-2.0.19-support-sc-key-3072.patch b/app-crypt/gnupg/files/gnupg-2.0.19-support-sc-key-3072.patch
deleted file mode 100644
index a3384e056693..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.19-support-sc-key-3072.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From ab4ea45f54006eba55db11263431c4c0c4f557dc Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 6 Nov 2012 14:39:22 +0100
-Subject: [PATCH 1/1] Allow decryption with card keys > 3072 bit
-
-* scd/command.c (MAXLEN_SETDATA): New.
-(cmd_setdata): Add option --append.
-* g10/call-agent.c (agent_scd_pkdecrypt): Use new option for long data
-
-* scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
-(app_select_openpgp): Store manufacturer.
-(do_decipher): Print a note for broken cards.
-
---
-
-Please note that I was not able to run a full test because I only have
-broken cards (S/N < 346) available.
----
- g10/call-agent.c  |   22 ++++++++++++++--------
- scd/app-openpgp.c |   10 ++++++++++
- scd/command.c     |   38 ++++++++++++++++++++++++++++++++------
- 3 files changed, 56 insertions(+), 14 deletions(-)
-
-diff --git a/g10/call-agent.c b/g10/call-agent.c
-index cded773..373d8c9 100644
---- a/g10/call-agent.c
-+++ b/g10/call-agent.c
-@@ -1034,7 +1034,7 @@ agent_scd_pksign (const char *serialno, int hashalgo,
- 
- 
- /* Decrypt INDATA of length INDATALEN using the card identified by
--   SERIALNO.  Return the plaintext in a nwly allocated buffer stored
-+   SERIALNO.  Return the plaintext in a newly allocated buffer stored
-    at the address of R_BUF.
- 
-    Note, we currently support only RSA or more exactly algorithms
-@@ -1058,20 +1058,26 @@ agent_scd_pkdecrypt (const char *serialno,
-     return rc;
- 
-   /* FIXME: use secure memory where appropriate */
--  if (indatalen*2 + 50 > DIM(line))
--    return gpg_error (GPG_ERR_GENERAL);
- 
-   rc = select_openpgp (serialno);
-   if (rc)
-     return rc;
- 
--  sprintf (line, "SCD SETDATA ");
--  p = line + strlen (line);
--  for (i=0; i < indatalen ; i++, p += 2 )
--    sprintf (p, "%02X", indata[i]);
--  rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
-+  for (len = 0; len < indatalen;)
-+    {
-+      p = stpcpy (line, "SCD SETDATA ");
-+      if (len)
-+        p = stpcpy (p, "--append ");
-+      for (i=0; len < indatalen && (i*2 < DIM(line)-50); i++, len++)
-+        {
-+          sprintf (p, "%02X", indata[len]);
-+          p += 2;
-+        }
-+      rc = assuan_transact (agent_ctx, line,
-+                            NULL, NULL, NULL, NULL, NULL, NULL);
-   if (rc)
-     return rc;
-+    }
- 
-   init_membuf (&data, 1024);
-   snprintf (line, DIM(line)-1, "SCD PKDECRYPT %s", serialno);
-diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
-index ff26b36..141b2b7 100644
---- a/scd/app-openpgp.c
-+++ b/scd/app-openpgp.c
-@@ -158,6 +158,8 @@ struct app_local_s {
- 
-   unsigned char status_indicator; /* The card status indicator.  */
- 
-+  unsigned int manufacturer:16;   /* Manufacturer ID from the s/n.  */
-+
-   /* Keep track of the ISO card capabilities.  */
-   struct
-   {
-@@ -3462,6 +3464,12 @@ do_decipher (app_t app, const char *keyidstr,
-                              indata, indatalen, le_value, padind,
-                              outdata, outdatalen);
-       xfree (fixbuf);
-+
-+      if (gpg_err_code (rc) == GPG_ERR_CARD /* actual SW is 0x640a */
-+          && app->app_local->manufacturer == 5
-+          && app->card_version == 0x0200)
-+        log_info ("NOTE: Cards with manufacturer id 5 and s/n <= 346 (0x15a)"
-+                  " do not work with encryption keys > 2048 bits\n");
-     }
- 
-   return rc;
-@@ -3749,6 +3757,8 @@ app_select_openpgp (app_t app)
-           goto leave;
-         }
- 
-+      app->app_local->manufacturer = manufacturer;
-+
-       if (app->card_version >= 0x0200)
-         app->app_local->extcap.is_v2 = 1;
- 
-diff --git a/scd/command.c b/scd/command.c
-index 6053fc6..3ce4a57 100644
---- a/scd/command.c
-+++ b/scd/command.c
-@@ -46,6 +46,9 @@
- /* Maximum allowed size of key data as used in inquiries. */
- #define MAXLEN_KEYDATA 4096
- 
-+/* Maximum allowed total data size for SETDATA.  */
-+#define MAXLEN_SETDATA 4096
-+
- /* Maximum allowed size of certificate data as used in inquiries. */
- #define MAXLEN_CERTDATA 16384
- 
-@@ -820,17 +823,24 @@ cmd_readkey (assuan_context_t ctx, char *line)
- 
- 
- static const char hlp_setdata[] =
--  "SETDATA <hexstring> \n"
-+  "SETDATA [--append] <hexstring>\n"
-   "\n"
--  "The client should use this command to tell us the data he want to sign.";
-+  "The client should use this command to tell us the data he want to sign.\n"
-+  "With the option --append, the data is appended to the data set by a\n"
-+  "previous SETDATA command.";
- static gpg_error_t
- cmd_setdata (assuan_context_t ctx, char *line)
- {
-   ctrl_t ctrl = assuan_get_pointer (ctx);
--  int n;
-+  int append;
-+  int n, i, off;
-   char *p;
-   unsigned char *buf;
- 
-+  append = (ctrl->in_data.value && has_option (line, "--append"));
-+
-+  line = skip_options (line);
-+
-   if (locked_session && locked_session != ctrl->server_local)
-     return gpg_error (GPG_ERR_LOCKED);
- 
-@@ -844,14 +854,30 @@ cmd_setdata (assuan_context_t ctx, char *line)
-   if ((n&1))
-     return set_error (GPG_ERR_ASS_PARAMETER, "odd number of digits");
-   n /= 2;
-+  if (append)
-+    {
-+      if (ctrl->in_data.valuelen + n > MAXLEN_SETDATA)
-+        return set_error (GPG_ERR_TOO_LARGE,
-+                          "limit on total size of data reached");
-+      buf = xtrymalloc (ctrl->in_data.valuelen + n);
-+    }
-+  else
-   buf = xtrymalloc (n);
-   if (!buf)
-     return out_of_core ();
- 
-+  if (append)
-+    {
-+      memcpy (buf, ctrl->in_data.value, ctrl->in_data.valuelen);
-+      off = ctrl->in_data.valuelen;
-+    }
-+  else
-+    off = 0;
-+  for (p=line, i=0; i < n; p += 2, i++)
-+    buf[off+i] = xtoi_2 (p);
-+
-   ctrl->in_data.value = buf;
--  ctrl->in_data.valuelen = n;
--  for (p=line, n=0; n < ctrl->in_data.valuelen; p += 2, n++)
--    buf[n] = xtoi_2 (p);
-+  ctrl->in_data.valuelen = off + n;
-   return 0;
- }
- 
--- 
-1.7.2.5
-
diff --git a/app-crypt/gnupg/files/gnupg-2.0.19-texinfo-5.patch b/app-crypt/gnupg/files/gnupg-2.0.19-texinfo-5.patch
deleted file mode 100644
index 836e2380fd55..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.19-texinfo-5.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru gnupg-2.0.19.orig/doc/gpgsm.texi gnupg-2.0.19/doc/gpgsm.texi
---- gnupg-2.0.19.orig/doc/gpgsm.texi	2012-03-27 10:03:23.000000000 +0200
-+++ gnupg-2.0.19/doc/gpgsm.texi	2013-04-10 11:46:02.179960198 +0200
-@@ -760,8 +760,8 @@
- This is the standard configuration file read by @command{gpgsm} on
- startup.  It may contain any valid long option; the leading two dashes
- may not be entered and the option may not be abbreviated.  This default
--name may be changed on the command line (@pxref{option
--  --options}).  You should backup this file.
-+name may be changed on the command line (@pxref{option --options}).
-+You should backup this file.
- 
- 
- @item policies.txt
-diff -ru gnupg-2.0.19.orig/doc/gpl.texi gnupg-2.0.19/doc/gpl.texi
---- gnupg-2.0.19.orig/doc/gpl.texi	2012-03-27 10:03:23.000000000 +0200
-+++ gnupg-2.0.19/doc/gpl.texi	2013-04-10 12:45:20.988492453 +0200
-@@ -659,12 +659,14 @@
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
- 
-+@end enumerate
-+
- @iftex
- @heading END OF TERMS AND CONDITIONS
- @end iftex
- @ifinfo
- @center END OF TERMS AND CONDITIONS
- @end ifinfo
- @unnumberedsec How to Apply These Terms to Your New Programs
- 
- If you develop a new program, and you want it to be of the greatest
-@@ -721,5 +724,3 @@
- applications with the library.  If this is what you want to do, use
- the GNU Lesser General Public License instead of this License.  But
- first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
--
--@end enumerate
diff --git a/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild
deleted file mode 100644
index 0930847caf0d..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild,v 1.2 2013/05/13 19:29:38 alonbl Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-ECCVER="0.2.0"
-ECCVER_GNUPG="1.4.9"
-ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	mta? ( virtual/mta )
-	readline? ( sys-libs/readline )
-	smartcard? ( =virtual/libusb-0* )
-	usb? ( =virtual/libusb-0* )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND} )
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Install RU man page in right location
-	sed -e "/^man_MANS =/s/ gpg\.ru\.1//" -i doc/Makefile.in || die "sed doc/Makefile.in failed"
-
-	# bug#469388
-	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
-		|| die "sed PIC failed"
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
-		die "sed PIC failed"
-}
-
-src_configure() {
-	# 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
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable ldap) \
-		$(use_enable mta 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) \
-		--without-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		--enable-static-rnd=linux \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--enable-noexecstack \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
-
-	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" || die
-		doman -i18n=ru "${T}/gpg.1"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
-	ewarn "you MUST make the gpg binary setuid."
-	echo
-#	if use !bindist && use ecc; then
-#		ewarn
-#		ewarn "The elliptical curves patch is experimental"
-#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-#	fi
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.13.ebuild b/app-crypt/gnupg/gnupg-1.4.13.ebuild
deleted file mode 100644
index 36e35ada5bbb..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.13.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.13.ebuild,v 1.11 2013/01/13 19:33:20 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-ECCVER="0.2.0"
-ECCVER_GNUPG="1.4.9"
-ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
-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"
-#		ecc? ( http://www.calcurco.cat/eccGnuPG/src/${ECC_PATCH}.bz2 )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 curl ldap nls readline selinux smartcard static usb zlib linguas_ru"
-#IUSE="bzip2 bindist curl ecc ldap nls readline selinux smartcard static usb zlib linguas_ru"
-
-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? ( =virtual/libusb-0* )
-	usb? ( =virtual/libusb-0* )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND} )
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-#	if use ecc; then
-#		if use bindist; then
-#			einfo "Skipping ECC patch to comply with binary distribution (bug #148907)."
-#		else
-#			sed -i \
-#				"s/- VERSION='${ECCVER_GNUPG}'/- VERSION='${PV}'/" \
-#				"${WORKDIR}/${ECC_PATCH}"
-#			sed -i \
-#				"s/+ VERSION='${ECCVER_GNUPG}-ecc${ECCVER}'/+ VERSION='${PV}-ecc${ECCVER}'/" \
-#				"${WORKDIR}/${ECC_PATCH}"
-#
-#			epatch "${WORKDIR}/${ECC_PATCH}"
-#		fi
-#	fi
-
-	# Install RU man page in right location
-	sed -e "/^man_MANS =/s/ gpg\.ru\.1//" -i doc/Makefile.in || die "sed doc/Makefile.in failed"
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
-		|| die "sed PIC failed"
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
-		die "sed PIC failed"
-}
-
-src_configure() {
-	# 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
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(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) \
-		--without-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		--enable-static-rnd=linux \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--enable-noexecstack \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
-
-	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" || die
-		doman -i18n=ru "${T}/gpg.1"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
-	ewarn "you MUST make the gpg binary setuid."
-	echo
-#	if use !bindist && use ecc; then
-#		ewarn
-#		ewarn "The elliptical curves patch is experimental"
-#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-#	fi
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild
deleted file mode 100644
index b39f8543269b..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild,v 1.4 2013/02/21 19:29:59 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4[static-libs]
-		>=dev-libs/libgpg-error-1.7[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		>=net-misc/curl-7.10[static-libs]
-		sys-libs/zlib[static-libs]
-		bzip2? ( app-arch/bzip2[static-libs] )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	mta? ( virtual/mta )
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.17-gpgsm-gencert.patch
-}
-
-src_configure() {
-	local myconf
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=" --enable-scdaemon $(use_enable usb ccid-driver)"
-	else
-		myconf+=" --disable-scdaemon"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		${myconf} \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable !elibc_SunOS symcryptrun) \
-		$(use_enable nls) \
-		$(use_enable mta mailto) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm -r "${ED}usr/share/gnupg/help"*
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>"${ED}etc/env.d/30gnupg"
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild
deleted file mode 100644
index 8bec34fd28ae..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild,v 1.2 2013/04/10 22:11:45 alonbl Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4[static-libs]
-		>=dev-libs/libgpg-error-1.7[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		>=net-misc/curl-7.10[static-libs]
-		sys-libs/zlib[static-libs]
-		bzip2? ( app-arch/bzip2[static-libs] )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	mta? ( virtual/mta )
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.17-gpgsm-gencert.patch
-	epatch -l "${FILESDIR}/${P}-support-sc-key-3072.patch"
-	epatch -l "${FILESDIR}/${P}-texinfo-5.patch"
-}
-
-src_configure() {
-	local myconf
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=" --enable-scdaemon $(use_enable usb ccid-driver)"
-	else
-		myconf+=" --disable-scdaemon"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		${myconf} \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable !elibc_SunOS symcryptrun) \
-		$(use_enable nls) \
-		$(use_enable mta mailto) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm -r "${ED}usr/share/gnupg/help"*
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>"${ED}etc/env.d/30gnupg"
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.19.ebuild b/app-crypt/gnupg/gnupg-2.0.19.ebuild
deleted file mode 100644
index d551a83b61c8..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.19.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.12 2012/08/19 18:43:45 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 doc ldap nls readline static selinux smartcard usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4[static-libs]
-		>=dev-libs/libgpg-error-1.7[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		|| ( sys-libs/zlib[static-libs] <sys-libs/zlib-1.2.5.1-r2 )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.17-gpgsm-gencert.patch
-}
-
-src_configure() {
-	local myconf
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=" --enable-scdaemon $(use_enable usb ccid-driver)"
-	else
-		myconf+=" --disable-scdaemon"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		${myconf} \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable !elibc_SunOS symcryptrun) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm -r "${ED}usr/share/gnupg/help"*
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>"${ED}etc/env.d/30gnupg"
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}