bump(app-crypt/gnupg): sync with upstream

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest

@@ -1,34 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
 AUX gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch 895 SHA256 063f50e8293282ec59ccf30567dafc16f5cdec800d2965acf8cf8a5050d8a9b3 SHA512 85423d0c0a2d6e85d569bd31c8f8209fb8707c827f041055bc2a1b20ec1372257574a2b72d86cdc1fa61188966bbb0e0ca176505bbd2bb1e2df12257f33ae259 WHIRLPOOL b9ee365eb55e637ca80b1ab88f1b48a9f925be73aba4f3e8e1c5526cbdb18a4c6326aa0282b45c6ad285b9c0d2f624e161679abd41bfcbd6cbf37764c0123467
 AUX gnupg-2.0.26-misc-cve.patch 3201 SHA256 d0f16d14da9868b79d17fa49ff284ec05fb45ef61f35c864bde9e38dc7539de2 SHA512 bb2860e5d8bb1567238e25d05cda7cb76557fa43dca3b8e802f7b4664e9b46e10187f2cbb76d1bcea5816d14c936d704fd606bdf125855ef3401b08412ac1fed WHIRLPOOL eefd707be37662bccd63d671496c79b30a07c13fb7497562887c678495020c382b5fb664ec8d5c76c45077fd6cfe36d4fc33f804b544f0efd042f6eaa5d2ed36
+AUX gnupg-2.1-fix-gentoo-dash-issue.patch 514 SHA256 961d924cc441a01c49d68f640fdd9d8a15d47ef02c85e3e4e15f77afd3de6b30 SHA512 2c269c049916a392210e2daedc7bb58281a9132bc51c3f4c136ee75cd19a78b76bf13814eb4165a65f8169968d4de4d407d42b2b36dd4e5284b5b10a4684c118 WHIRLPOOL c0a904864331bcb585783e7b61a15f1f57e80671e124e6bdccd01f21ee1e1c70da46f9b17007480f3b1d2957e8e9440d21bc108464abcbd3473a468c2496f227
+AUX gnupg-2.1.12-fix-signature-checking.patch 1547 SHA256 fe0d44d068b258c757514ce4e54e9de3b40513113e0bb676ab697d1e7bd18c8a SHA512 24c7a853f5b37412903da560e6ee6dd0a98014941fb0f250061398bb29f021d1dc07b241700811eebb895e0715446f95220543c4dc57f70e21fde59827374a83 WHIRLPOOL 485fcdfc1499e9ac6d83bed86365114c492255a8b74f49efca9ffb5ca3dcde8294320831a355e3b72fe7ae9bef4f8fa8a322cc998ad9821af6a99da044b04451
 DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
-DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
+DIST gnupg-1.4.20.tar.bz2 3692881 SHA256 04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc SHA512 8a66d5a45dcf0508601452061eb1965c3c56c56f0e5ded00b7f54c6104de0a305c1d526abd37be2f55cd9bde79600d9cfaf60536af77ff733d778ace5fcd9dad WHIRLPOOL 26344b6ba0e5f0f11fa411f5af265c922b3b1d62ff030433eb8dc6fef00dbf2ec3370ecb081dd5c6cf85a4a37e7f12aacc83e07b803cc80adda29a11a4a3c715
-DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
+DIST gnupg-1.4.21.tar.bz2 3689305 SHA256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 WHIRLPOOL eb596be347dd90be93d381fe405e50f5808160b546705493bc9d817d521ea236a2374648e6c2cab396f54bba74de4caf2b92e894df3a17aa339f014ef8cc8802
-DIST gnupg-2.1.4.tar.bz2 4885653 SHA256 64127eedd868510f2bccccb22c507a4878ffa07495db16a0f976c67f56426cb0 SHA512 57cabe1c00b830d383790d346b2ac6aafe1df5c71728b3a6e7e9164d0ace7e9638c7c6c01849946fbff671ea8f76d9ec3ea8878419c80cbc70c918e98e955310 WHIRLPOOL 2990169789708c5b2c47c2b4bf64fcc62c1bf0e093ad1991e2975e9a8da3be76142482cf7a29afc9965d9f08aabb8244fabfbe92a9d4d772fb400f6d41ca1ab4
+DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
-EBUILD gnupg-1.4.19.ebuild 3472 SHA256 e2d789f8ddd23866340e7e2cd450e7d7c51ea135e403571ec00873e85e04a4a1 SHA512 e4b5eb1b1d03762528464596316e433ec2b01330cd76ce5a7d7006ba77f8b7dda2d15e66f8574803a229fb5f543c587fe01b82ad981bb7a26c7ad7c2d86d7f7e WHIRLPOOL 9452157d05e9fc515af5b1d71bc14c820ac09337d6b3ac5ff66bca45a7de1ea50958f42bfdc6aee3f27e2596997efe36a473e7053bd904e144c73c3fbbc3a17e
+DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
-EBUILD gnupg-2.0.26-r3.ebuild 4889 SHA256 d68393d52300de25451d6e732c7c10484f31283b560988e4992e9ac8fed0874a SHA512 5cc4f633741c32f244aa43eb4606a339e9de7b0d7ceb6cc38bdc985293efc605abcaafe438d0d60250d30f1cf7923a92a093d854f2abb28b302a8ff385b4cfc9 WHIRLPOOL 3d5df13d06a20c6cb53ca9259a416e7f0fc6490331d19ba4b98508d1dd18ddbcfe19913ce0a8fb61071c5a4ed38e8d9dca68b79f22ceb97890ce8236dd2e739c
+DIST gnupg-2.0.30.tar.bz2 4414652 SHA256 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 SHA512 e60a57f7dc74b44f884fd50d5a9c51cef7df8c098644ebab9ef7d945a40b0e4a285d0dc80b10fe39d8e4c2cc9d6cbbe800a0ddae54883180dc755fe47ced3314 WHIRLPOOL 007315882becc1204edf6833a13610284ce7e1c73429fc3b4170c35ba61c645299f811f01b1bc0506b1cf94ce0de23af4cea33f51cf97397ec61caa15ce3ac6c
-EBUILD gnupg-2.0.27-r1.ebuild 4814 SHA256 e886319d458473e57a6f88e1f0c15d791e3375e66aca80eceebd3bad539c52ff SHA512 656c96421556ac1b6b1022d28b452db23de5100c0cf8ed0c51e73053f4526d7c38c6682dea596ab7d36489b20978da6a1375a56f5ca24b43b78394c859de363b WHIRLPOOL b3fe2d812c0defcff16030f6fdb07a9b430781fa0027c45dcda3c921785413271ec492f789a7a1a4f5c393794ab539f0bb7e263fd1eb1784972a752d3fd3b9a5
+DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151
-EBUILD gnupg-2.0.27.ebuild 4782 SHA256 5453bd69096075d8866a4877b6dbc3efa03a85ae8cbee63ff72269741749545e SHA512 6fa97736a7995c4f6a0095453bfdc0a627c9915da1e7442a65933532aa2ec7d21fdc69ae1cc1b32147731927eaa3cd1716715fdc8dcd969956201649a9da23ce WHIRLPOOL f9f7fe16b87194311f24f9699c561248faec2600fb632a9bd14a205e5ba8092826c7167e895968ea516d6b260f5bc618faf412cd5e5df0198d04891f7ad2c4f1
+EBUILD gnupg-1.4.19.ebuild 3372 SHA256 eb7614464a39d2a871f5963dcc61e82a13cbcab1aeedb0740228c726f895d2e9 SHA512 4726afc7f124f672e1e358fcc2b496728a8d3f507181d85d287f70eb743b5d3a527b020be2ba7473f4b60994169a380da501f100c09ed468818d2405c34b0797 WHIRLPOOL 1e9efd7a18e685fb42a1d8547b5668490b197ccdc4eab3bb07ca8075bcb58492a18f2d634ba8b1f91d2b8b872676106d31df4c38dcb645e113497989fcc13606
-EBUILD gnupg-2.1.4.ebuild 4682 SHA256 adf6e605e853afc1483bca21d47385bc067bd489a07c71e8231b420a27ad63cd SHA512 0639c377ed60fdf826a93e7118218e58d0cc1b3eaa9c8d04a911a920cf250bcf5ae225c4413f59cb724a2c2d78bd56d08a0be86178ad906e051b8ced8e7a65b6 WHIRLPOOL 65de8848ff518b20fdf68a804a1e48fb6def9bbcb5dc763934cb4f5ded1934be6265645711a67c356fcabb76a92068a5772bc7a821b425bfcf0ed32236bc67f1
+EBUILD gnupg-1.4.20.ebuild 3384 SHA256 220365635e57bf6b01037ad79a28b86dffe7e80c5e9e80e3b1e837b747762f5e SHA512 4049594a0868d09b19e0611b502abcb3a6179525b5feb7dc608168071892847dab466242d138c96c93743480c7dcd81724e3038b199909ec1e7950e6916a6a38 WHIRLPOOL 01c17a71180ccb068155ed872f18774c90d9077323aa8b0db89b1e61f903f348c1f8f11970320d6ad30e17019bb17b9f6dc2e41bbea14001371ecba0fec4b860
-MISC ChangeLog 88474 SHA256 d60408c16cdc1cbad86461bdd411fa9b3a3a581826e574ae91a3ce7870ff9feb SHA512 d5e6fd00852ad0e372f5b5d887582990e20b6e3a35a4980164890e6cd7314af2139957185b0f076fa5a3bcd447cb74b84a24351179bd97e14b8813083930e550 WHIRLPOOL 6a62ff8d864391a8d6e16d5b39532cc89927a8a9a74261ee47f075fe82d5adda3b9643cab96e19d28dcf6f509fdcc6fac15eaa365e84b95eb66b81bd2b1706f3
+EBUILD gnupg-1.4.21.ebuild 3375 SHA256 01264a6ded99699972cc34739d13e30536a53f466504932b8a281a323c252d2b SHA512 091813854e09b800a02dfead662bdc5e0c2845c318384af5954f10412be0e03b827f997d7d1411086747b6187ef314312d0c7dc109fed84f56c91560bd06b763 WHIRLPOOL fa97634e9758606afb23feb2ffe662dc9e1c55366e458d7b8ef224c1c2c0bc40a69bbfa510e5da62df21a9b38893777d210379de1ecaa88be07607664e3823ca
-MISC metadata.xml 1032 SHA256 cbef1621eb1364c8d12ac18e71cf4aabfced9ecd3c990a3f3cdf066902dc97bb SHA512 5e2ef4380effe027a0b0b8a11a29ed1996b3b5256ee333909d4a7cfcb18ea1e9dead9b8303c7dffc1ad10014dea79e827b1d84caa92294f4d3dfc29ff23a6af5 WHIRLPOOL a24c7f71ed140f34dd59b10314869d0c5482063be20faefa1591595feb856c79bc57a6b344dd467875cf3389d8cd14e2d41f2312f51d3b77dcbe27af97b7f129
+EBUILD gnupg-2.0.28.ebuild 4850 SHA256 22a7afe802626f9332fa07ccdbbb7b058c3d54ef4e64f9afa241080380eeab71 SHA512 34ebbe9c768e254248a79b92e746f2bad757d122bd329fb65436ae7c6f2405a43594d131b3ed88fa029579d76341de3ad7a59337c12a382e75b75f6ddd435a60 WHIRLPOOL 8d0a3bb121e247079b2330cb5294c572187c99fe591e535e4022c17c5c6c77241d990d89c459027641f392c185cf8260af28a5495e888f874558fe784f38b3cb
------BEGIN PGP SIGNATURE-----
+EBUILD gnupg-2.0.29-r1.ebuild 4978 SHA256 7524b83ab9efaa9ea9cb54590ef2070d2f0a12e4063848703ae352913834a3b4 SHA512 3b177c3aa5949aa51a43c698dbd7bcdc208d152759acb2fd04b4c96a9fb2b31a608b06f5782f56a4cff1a03616c5947cbb8ef59eff948cbed9be220e7985f0e4 WHIRLPOOL b21df882aa93a645acaea838fdfc68e658408bbe0ab52e577b6f4ee65eb8e8dbc126d0a35f022edf9d239269c22fd82d68b239b8419397709d05532aa4f256e6
-Version: GnuPG v2
+EBUILD gnupg-2.0.30.ebuild 4980 SHA256 bd29bea48709efda695d96c1c31c383793a8ab56e742e74555b9e9b45a9bb335 SHA512 740d16d7c5aa29d8ade28b67d7bffacb036671b9aa1800ca04c5fb81d2dafbceb4529236e91b91c61e93cafed11cca7bd471ed165ce75941bf1fb38b9cbf5b90 WHIRLPOOL 8860cfdbe126f9a2a72126064ed866d21209ee55f318a1f6de1c56fed7a64fad1be78470968722f74ebb9eb1b67e87459525564ca40992fbe0a5226a09c9f218
-
+EBUILD gnupg-2.1.15.ebuild 4431 SHA256 5fa53b903e10f0c79e0a12549b2549541b97f28ddf48fd5a180332641337047d SHA512 03a2e4e6bfffb0eca588a1e9f9b6d693702487ac5c289b7dad226735bf1231b8635cd9369e77c8f21da76c2d023e064d039920cc4c8ea590dd98c070bafe8ba5 WHIRLPOOL 8c7f4514cf789d8724ef2462f9f14a4ca153415558ada4aeceaeb22f877c6bfa23e001ea68ad97a25e388885f9cf66a75dc92d68f0a403347d42486d2fafe107
-iQIcBAEBCAAGBQJVXWGlAAoJEA/daC2XTKcqu7EP/0CqYWP1gcnuI8X+8Hmi63Po
+MISC ChangeLog 14435 SHA256 e6085be566a423fa2bb08b6fc625a1ea8057efda69ef455a97615e25d360fdd1 SHA512 fc62dfcdff1375a02b2a19417105ec43e702e16b104e2ed29f59e282f49d1c648ff6e31382b86c36cd97f80b1d5f8d4fc5050d1f6211c0fa9ffdd69e1e7f13c0 WHIRLPOOL ca9c35bdbd423a3c65a9ad2479f7e3b8ce4eca7af62b991aa2f6ca5c5452a5f8b791214c9bb525391fab5ec895179ae9ac057cc21565e3d88fcd93dd1f8f42cc
-89EdpYWDjb0XPqzerlI5ITpEDPuprv472iio3+Fxduo1RgFLEWWVprCOBWM9DM56
+MISC ChangeLog-2015 89046 SHA256 295a825284cc7d9b7148c77733782937402db7e07fd7fbf0a9f44861d2018ce7 SHA512 9920db843f9cc1863f3529ac2022f591de8f0b930f82b64ca2859d542af679de3dcc733e5b55b8de060df9bf01ce68cd1828d0c179b1f9f05093cd6566efddc6 WHIRLPOOL d21dbe313d4c1b0e50012e0cc05560d13b712875514dbbea2f56be40ce85c99db8a7693a0f4492dd631119d37cbc796546fe5b62f5d6a6baf598d0a94c0ac0a3
-kj/fmGQ6hLdEXUmNO24Kjz6O5V7lRsDrxXYjvO0VYe1RjxCW/0mxtCZO+1ZfzP/2
+MISC metadata.xml 1211 SHA256 c9be6af1ab9cc14b1b09ad2ed9ea4530148c2c5476f6335b096b83798e8dccef SHA512 521cef0f8f903af1cf5d59a4c15d1ee8ee264052d8156a3b00489375b5cff5fdb42b933d918a2c8ca1f51997c2ffdd4c2a9c9417240d42bfea9329ccfcec4f07 WHIRLPOOL d98abfc91888e2058b08903dbe7c9c0686ac2852815ca1800d9f219f7eedb309c0a780eabcfdd21e08cbf1225ac6873fbf6ee7724d2226a569ce5cbcbf41a2f5
-UJpPHFr+jz07VYhBdpO7j1PMDAgocPYY3wRdMU4B1/2/QBqsAtukFy/H4nk7giSl
-c8MbKwhjmh3w2QJgCn2wnDKxLSojNBp8R1Y+0QCXqaidFHNzPWaExBWPDGuw2P2f
-Eoz4MsRG0YofgFs8s6C0rdt+feTvdyA/whAjeF8PcH1e/bz5b3Atii7D+eEW7En2
-CDXAaf/i/XkEDUgk4Z6q4p9FNZSBou2LhgAasoUyG5hEwvtHauUehVL0E5MKQADl
-s+WvFwDSn+WsfrXEEJMh/FWJR392mhqD0fGe0Hf23FPErtvaJRQQ/4ZTG3gRSij3
-WtsR7zxDCA3vwpcEabVM4xXE/i1WKZWZa4o8KVoKs4XER/sMwB4SX57cyeEbKjVQ
-66DIRxXRhtFYkiiYiADKQq0H5gWITrXQvyQfZgycvTCCpfUxliBP09A88AJTt69w
-4R0geWGtiohj1WxKAvVx15AQIZdfi+IYhLEQauT5EU5TQcmy+7GBixQLh97Ft5nI
-0NeaB9UVrIZaoKCTpgb6
-=H6bC
------END PGP SIGNATURE-----

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/files/gnupg-2.1-fix-gentoo-dash-issue.patch

@@ -0,0 +1,12 @@
+diff -Naur tests.old/openpgp/mds.test tests/openpgp/mds.test
+--- tests.old/openpgp/mds.test	2016-05-03 13:13:11.373313389 +0200
++++ tests/openpgp/mds.test	2016-05-03 13:13:31.886755059 +0200
+@@ -63,7 +63,7 @@
+ 
+ [ "$failed" != "" ] && error "$failed failed for empty string"
+ 
+-echo_n "abcdefghijklmnopqrstuvwxyz" | $GPG --with-colons --print-mds >y
++printf "abcdefghijklmnopqrstuvwxyz" | $GPG --with-colons --print-mds >y
+ if have_hash_algo "MD5"; then
+   test_one ":1:"    "C3FCD3D76192E4007DFB496CCA67E13B"
+ fi

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/files/gnupg-2.1.12-fix-signature-checking.patch

@@ -0,0 +1,50 @@
+From 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Wed, 11 May 2016 19:27:03 +0900
+Subject: [PATCH 1/1] g10: Fix signature checking.
+
+* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
+walk_kbnode.
+
+--
+
+Thanks to Vincent Brillault (Feandil).
+
+GnuPG-bug-id: 2351
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ g10/sig-check.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/g10/sig-check.c b/g10/sig-check.c
+index 290f19a..7000b48 100644
+--- a/g10/sig-check.c
++++ b/g10/sig-check.c
+@@ -797,15 +797,20 @@ check_signature_over_key_or_uid (PKT_public_key *signer,
+             *is_selfsig = 1;
+         }
+       else
+-        /* See if one of the subkeys was the signer (although this is
+-           extremely unlikely).  */
+         {
+           kbnode_t ctx = NULL;
+           kbnode_t n;
+ 
+-          while ((n = walk_kbnode (kb, &ctx, PKT_PUBLIC_SUBKEY)))
++          /* See if one of the subkeys was the signer (although this
++             is extremely unlikely).  */
++          while ((n = walk_kbnode (kb, &ctx, 0)))
+             {
+-              PKT_public_key *subk = n->pkt->pkt.public_key;
++              PKT_public_key *subk;
++
++              if (n->pkt->pkttype != PKT_PUBLIC_SUBKEY)
++                continue;
++
++              subk = n->pkt->pkt.public_key;
+               if (sig->keyid[0] == subk->keyid[0]
+                   && sig->keyid[1] == subk->keyid[1])
+                 /* Issued by a subkey.  */
+-- 
+2.8.0.rc3
+

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.19.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.19.ebuild,v 1.11 2015/03/30 10:02:07 ago Exp $
+# $Id$
 
 EAPI="5"
 
@@ -107,7 +107,7 @@ pkg_postinst() {
 #		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 "See https://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"

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.20.ebuild

@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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"
+
+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:0= )
+	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() {
+	# 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() {
+	default
+
+	# 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
+}
+
+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 https://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"
+}

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.21.ebuild

@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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"
+
+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:0= )
+	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() {
+	# 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() {
+	default
+
+	# 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
+}
+
+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 https://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"
+}

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.28.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild,v 1.12 2015/03/30 03:06:10 tgall Exp $
+# $Id$
 
 EAPI="5"
 
@@ -13,12 +13,12 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
 	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4:0=
+	>=dev-libs/libgcrypt-1.5:0=
 	>=dev-libs/libgpg-error-1.11
 	>=dev-libs/libksba-1.0.7
 	>=dev-libs/pth-1.3.7
@@ -57,8 +57,6 @@ REQUIRED_USE="smartcard? ( !static )"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
-	epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
-	epatch "${FILESDIR}/${P}-misc-cve.patch"
 	epatch_user
 }
 
@@ -85,11 +83,15 @@ src_configure() {
 		myconf+=( --enable-symcryptrun )
 	fi
 
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-gpg \
 		--enable-gpgsm \
 		--enable-agent \
+		--enable-large-secmem \
 		--without-adns \
 		"${myconf[@]}" \
 		$(use_enable bzip2) \

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.29-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild,v 1.1 2015/04/19 21:06:27 alonbl Exp $
+# $Id$
 
 EAPI="5"
 
@@ -18,8 +18,8 @@ IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
 	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4:0=
+	>=dev-libs/libgcrypt-1.5:0=
-	>=dev-libs/libgpg-error-1.11
+	>=dev-libs/libgpg-error-1.19
 	>=dev-libs/libksba-1.0.7
 	>=dev-libs/pth-1.3.7
 	>=net-misc/curl-7.10
@@ -83,6 +83,10 @@ src_configure() {
 		myconf+=( --enable-symcryptrun )
 	fi
 
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-gpg \
@@ -115,7 +119,9 @@ src_install() {
 		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
 
 	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
+	# The help*txt files are read from the datadir by GnuPG directly.
+	# They do not work if compressed or moved!
+	#rm "${ED}"/usr/share/gnupg/help* || die
 
 	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
 		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.30.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.27.ebuild,v 1.1 2015/02/18 17:42:40 k_f Exp $
+# $Id$
 
 EAPI="5"
 
@@ -18,14 +18,14 @@ IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
 	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4:0=
+	>=dev-libs/libgcrypt-1.5:0=
-	>=dev-libs/libgpg-error-1.11
+	>=dev-libs/libgpg-error-1.19
 	>=dev-libs/libksba-1.0.7
 	>=dev-libs/pth-1.3.7
 	>=net-misc/curl-7.10
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:= )
 	smartcard? ( usb? ( virtual/libusb:0 ) )
 	ldap? ( net-nds/openldap )"
 COMMON_DEPEND_BINS="app-crypt/pinentry"
@@ -83,11 +83,16 @@ src_configure() {
 		myconf+=( --enable-symcryptrun )
 	fi
 
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-gpg \
 		--enable-gpgsm \
 		--enable-agent \
+		--enable-large-secmem \
 		--without-adns \
 		"${myconf[@]}" \
 		$(use_enable bzip2) \
@@ -114,7 +119,9 @@ src_install() {
 		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
 
 	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
+	# The help*txt files are read from the datadir by GnuPG directly.
+	# They do not work if compressed or moved!
+	#rm "${ED}"/usr/share/gnupg/help* || die
 
 	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
 		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.1.15.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.4.ebuild,v 1.2 2015/05/21 04:39:45 mattst88 Exp $
+# $Id$
 
 EAPI="5"
 
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="http://www.gnupg.org/"
@@ -13,22 +13,23 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
+IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb"
 
 COMMON_DEPEND_LIBS="
-	dev-libs/npth
+	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2
+	>=dev-libs/libassuan-2.4.3
-	>=dev-libs/libgcrypt-1.6.2
+	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.0.7
+	>=dev-libs/libksba-1.3.4
 	>=net-misc/curl-7.10
-	gnutls? ( >=net-libs/gnutls-3.0 )
+	gnutls? ( >=net-libs/gnutls-3.0:0= )
 	sys-libs/zlib
 	ldap? ( net-nds/openldap )
 	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0= )
 	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
 	"
 COMMON_DEPEND_BINS="app-crypt/pinentry
 		   !app-crypt/dirmngr"
@@ -36,41 +37,23 @@ COMMON_DEPEND_BINS="app-crypt/pinentry
 # 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.6.2[static-libs]
-		>=dev-libs/libgpg-error-1.17[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		dev-libs/npth[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} )
+RDEPEND="${COMMON_DEPEND_LIBS}
 	${COMMON_DEPEND_BINS}
 	selinux? ( sec-policy/selinux-gpg )
 	nls? ( virtual/libintl )"
 
-REQUIRED_USE="smartcard? ( !static )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
 	epatch_user
 }
 
 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
@@ -86,6 +69,10 @@ src_configure() {
 		myconf+=( --enable-symcryptrun )
 	fi
 
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-gpg \
@@ -98,6 +85,8 @@ src_configure() {
 		$(use_with ldap) \
 		$(use_enable nls) \
 		$(use_with readline) \
+		$(use_enable tofu) \
+		$(use_enable tools wks-tools) \
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 }
 
@@ -117,7 +106,9 @@ src_install() {
 		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
 
 	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
+	# The help*txt files are read from the datadir by GnuPG directly.
+	# They do not work if compressed or moved!
+	#rm "${ED}"/usr/share/gnupg/help* || die
 
 	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
 		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*

sdk_container/src/third_party/portage-stable/app-crypt/gnupg/metadata.xml

@@ -1,30 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>crypto</herd>
+  <maintainer type="person">
+        <email>k_f@gentoo.org</email>
+        <name>Kristian Fiskerstrand</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
   <longdescription>
     GnuPG is a complete and free implementation of the OpenPGP standard as
     defined by RFC4880.
   </longdescription>
   <use>
-    <flag name='smartcard' restrict='&lt;app-crypt/gnupg-2.0.17-r1'>
+    <flag name="smartcard">
-      Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
-      scdaemon.
-    </flag>
-    <flag name='smartcard' restrict='&gt;=app-crypt/gnupg-2.0.17-r1'>
       Build scdaemon software. Enables usage of OpenPGP cards. For
       other type of smartcards, try
       <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
+      Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
+      scdaemon.
     </flag>
-    <flag name='usb' restrict='&gt;=app-crypt/gnupg-2.0.17-r1'>
+    <flag name="usb">
       Build direct CCID access for scdaemon; requires
       <pkg>dev-libs/libusb</pkg>.
     </flag>
-    <flag name='mta'>
+    <flag name="mta">
       Build mta support using
       <pkg>virtual/mta</pkg>.
     </flag>
-    <flag name='tools'>
+    <flag name="tofu">
+      Enable support for Trust of First use trust model; requires
+      <pkg>dev-db/sqlite</pkg>.
+    </flag>
+    <flag name="tools">
       Install extra tools.
     </flag>
   </use>

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-1.4.19

@@ -10,4 +10,4 @@ RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? (
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.19.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1e0195db3c3fbccaebcb8ac79415543c
+_md5_=e211d9a850940a7639d03a0432bbb73d

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-1.4.20

@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) dev-lang/perl nls? ( sys-devel/gettext )
+DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 curl ldap mta nls readline selinux smartcard static usb zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.20.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=d5e8763bfcd8daba94dd07aa3901aeef

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-1.4.21

@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) dev-lang/perl nls? ( sys-devel/gettext )
+DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 curl ldap mta nls readline selinux smartcard static usb zlib
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.21.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=78091dd52a19420fddd9897dbb95ac58

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.0.27-r1

@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[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 )
-DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
-EAPI=5
-HOMEPAGE=http://www.gnupg.org/
-IUSE=bzip2 doc ldap nls mta readline static selinux smartcard tools usb
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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
-LICENSE=GPL-3
-RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
-REQUIRED_USE=smartcard? ( !static )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.27.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f8367e68259a48013ce70801d303b792

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.0.28

@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[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 )
+DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[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 )
 DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc ldap nls mta readline static selinux smartcard tools usb
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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
 LICENSE=GPL-3
-RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.26.tar.bz2
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.28.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a91b6ee82c2bac3ccf9901c52e4430c5
+_md5_=ff634a427ccf4610a085258a01e0f50d

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.0.29-r1

@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[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 )
+DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.19 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[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 )
 DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc ldap nls mta readline static selinux smartcard tools usb
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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
 LICENSE=GPL-3
-RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.19 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.27.tar.bz2
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.29.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=011f148bc1c8d00250f73069cf9ac381
+_md5_=a5a69a1d1abbc9a8d792ae9817c2c8cc

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.0.30

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.19 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[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 )
+DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 doc ldap nls mta readline static selinux smartcard tools usb
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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
+LICENSE=GPL-3
+RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.19 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+REQUIRED_USE=smartcard? ( !static )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.30.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=54d29ef4e2b7f791016710fda17b7fe9

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.1.15

@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.15.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=0ae6f790cca2091d2071d36ad9c79eb1

sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.1.4

@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/npth >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.2 >=dev-libs/libgpg-error-1.17 >=dev-libs/libksba-1.0.7 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0 ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) app-crypt/pinentry !app-crypt/dirmngr static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.6.2[static-libs] >=dev-libs/libgpg-error-1.17[static-libs] >=dev-libs/libksba-1.0.7[static-libs] dev-libs/npth[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 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=5
-HOMEPAGE=http://www.gnupg.org/
-IUSE=bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=!static? ( dev-libs/npth >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.2 >=dev-libs/libgpg-error-1.17 >=dev-libs/libksba-1.0.7 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0 ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
-REQUIRED_USE=smartcard? ( !static )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.4.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=472f1b7a59215c491762f5afadaee17f