gentoo resync : 16.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-16 05:02:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-16 05:02:38 +0100
commit: f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
tree: c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /net-misc
parent: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)
52 files changed, 413 insertions, 2626 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 74c2d820ce94..915a6794fc1a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 7679d52c7335..c3b0de459b6b 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -1,54 +1,8 @@
-DIST asthostid-x86_32 1166416 SHA256 c6a208e4842a8137cd0efe86d0b4b82fe995bfb443d935e9a6fa6c69e3c191f8 SHA512 ce1ca53281af99f15b74ea8034d8ea7db1cebbf4d35274381d03f4c7e28293be64c81a6188c5a9d168ce9af208820db235b1c5c9c9f8fcd11a14045e05cbc647 WHIRLPOOL ba83aa3bdcb3552ab35dfa1d536860a6dcaa50fcbf91bad1e7af8e7caae3af4812e2a169d9520dd9c6ddf376ff32afa7aaf9eaa3d485ff1d68e293498cc5ee34
-DIST asthostid-x86_64 1166416 SHA256 c6a208e4842a8137cd0efe86d0b4b82fe995bfb443d935e9a6fa6c69e3c191f8 SHA512 ce1ca53281af99f15b74ea8034d8ea7db1cebbf4d35274381d03f4c7e28293be64c81a6188c5a9d168ce9af208820db235b1c5c9c9f8fcd11a14045e05cbc647 WHIRLPOOL ba83aa3bdcb3552ab35dfa1d536860a6dcaa50fcbf91bad1e7af8e7caae3af4812e2a169d9520dd9c6ddf376ff32afa7aaf9eaa3d485ff1d68e293498cc5ee34
-DIST astregister-x86_32 1178780 SHA256 14cbcfc5e6b3aa03c2885816aef87b5d96ee34b3c7f70b1b536a975423c5358d SHA512 4e6009df693878c4fcd034de122d11a5f69a085e2228604994dfce460301d70a418672e3af2fe35c22a9618dc28cb77ed0702b20e41429fb10bd28dbb085a55d WHIRLPOOL 763dfd25442a69372bffef191647972a05fbe7f06b25440e46d010f59afb74a4d219b8b704420df3b8c0a65a22ea90435713220bdaa06bc270e43065f0cc11c1
-DIST astregister-x86_64 1178780 SHA256 14cbcfc5e6b3aa03c2885816aef87b5d96ee34b3c7f70b1b536a975423c5358d SHA512 4e6009df693878c4fcd034de122d11a5f69a085e2228604994dfce460301d70a418672e3af2fe35c22a9618dc28cb77ed0702b20e41429fb10bd28dbb085a55d WHIRLPOOL 763dfd25442a69372bffef191647972a05fbe7f06b25440e46d010f59afb74a4d219b8b704420df3b8c0a65a22ea90435713220bdaa06bc270e43065f0cc11c1
-DIST benchg729-x86_32 2948664 SHA256 47a33e8588843cd7245b8ed483e061da39f12ee10c602476e302fa35ca7985e9 SHA512 e03d699f6f4cbd2d22cbab534eb032977373ef56320d061c45bd5f0a34f5f88a2f9185491d3c6ef6365c923e5703abc795eedff981e351472f3254307666d941 WHIRLPOOL ea8f0d65ac572b8827770724e400ae48b1318bb749d12fe61c3d5837459f11e9de2ee3605ea3fc86391972c01f2a994851628aab3d9aa6cf12703a3199380144
-DIST benchg729-x86_64 2358320 SHA256 bb2694fd5676eb9049933d785f79713a11fbdec0c49917787e4415866c1e25a3 SHA512 1239c64a6da40a8d0ef24f69fc31571a756e280757040e853ddbe3800c3d2a911d454a85b4474e3b5afd585ba56cc28a8f1ef17006211fe336c0cb223ee63ef9 WHIRLPOOL af1830efaa67d5a97c308524738ea642b426cc50478eab8eb496f1c1474140cd83e54a1f65d219f45bd57c029c08861359b083f052768fe177c7fc79477a9a4b
-DIST codec_g729a-11.0_3.1.5-athlon_32.tar.gz 403854 SHA256 c7a78449a5fe4f03893aa9c4e415830b4847089f4dfaecc622a2646f4c5c5ff6 SHA512 8da743dc946633f9a4f6754f938ed90591c58792346322eb3ed53f1a6b31137c2a5ba62b8856f2dc03546a05e16e2c08ba3bb5154b4e41123669293c9d335545 WHIRLPOOL 15df98054b68ca9d77d1fc229b8e8c6a16bbcc0cdc6e03ce038b55ad2849b5f9d8b134ddcfbabef9572bb0d1b30b4bf4fa014631fda3947b4d439d96660c1dd8
-DIST codec_g729a-11.0_3.1.5-athlon_xp_32.tar.gz 403409 SHA256 04395a18c3ae9889be40c0aa171806e382a5ab5ac7603186cee039c00faa872c SHA512 a7bb535adc55910444648d142b064a52e9fd8492f94338e2f26df3eb24ddb71436ab90d4beb39e2d452dcecb8fae25869ab5d52cb290368398850d60718233a3 WHIRLPOOL 9b9aa3d70961c94d87b7d0518d9496dfe44a65d880c4091e2a6771804e66e810213eb213c3536bfee01415f6370f0c7dea3906a5cc32808d2a6fd06e4f63e3f8
-DIST codec_g729a-11.0_3.1.5-barcelona_32.tar.gz 411880 SHA256 726d2b14f9cd210d113c4ef07e7cb1a60448caebb172eec16831cfdc0a6f2f99 SHA512 3bead54be5dd1d006844b6b8a7064777ea7774c90dc8d4d6d1528b64f0ade6c962806ece216ebda976dff730c235e132b2a820232ae1403681e6f86adf8bff24 WHIRLPOOL 3d7669161340d7060f86a4bc0d606af8746ec235fa04e2713ebd37453728a842b155bcf93ad1a065b4e444fdbd58fe1d46b3f42bab73faa86b4c7a99b678cc2e
-DIST codec_g729a-11.0_3.1.5-barcelona_64.tar.gz 464638 SHA256 dd23e224554a25fd8832cf5e64700122443ce8ffe980fa514b6af082d9a79c1f SHA512 f9e3b6dde8c212569e4ff94dc30abc22db967fe2fca9c5b087c29689c7e8667dae41e3f265dea4afc9da15d72047bd39e0e7f643d875e50ff7b003ed8c3ef5fa WHIRLPOOL aec9e3f04ebb7224b702dc892483b068c19fcf7743e9a5f118065663042bc43ed1cbd414b48c6caf381140135a7281c1c7290ac3b47bab5646c67026696f1d3b
-DIST codec_g729a-11.0_3.1.5-c3_2_32.tar.gz 404444 SHA256 2092329f86b2b58fc0a2451be6706ef2e8c892674b20f77f47a9df2eb3f59c55 SHA512 3a135fe006797066966f9e8f4ca6323dba35669bcec18cc028b98776f57adf911da17befb2fd04a8081bd1488263ab3c0f5b639d6d2dcc9b728a3238b4bcf91e WHIRLPOOL 996d4ebc6ced44ce096ad9fb14c380de8a7112c3c0e2b6938e7d7dea889808e19b7eb40357ba25f23d9aa15ba953d1f6d9f76378da27f7d35c35c8da636beec7
-DIST codec_g729a-11.0_3.1.5-c3_32.tar.gz 405421 SHA256 875bd2b6c25cbbf0f98829d6794eaeee355fcd17434d57a687531c6ca3d8b8ff SHA512 1b3c07d142c517847d00004041623e5b5f0c003dfe74dd299f4399659175c03e0846b2b6a5403c60ae44e765c74d18f73cd4d0509c81e145e0fe07a2eadb0630 WHIRLPOOL b3813d77c98a02b0fa4a2fd73c8881a8f9804fa108e2abaf7ac7b4728023c730e0875b19193e3a75cb571488f0ec13f27fca3ba64dc3e4df7871fd0bf0655c9b
-DIST codec_g729a-11.0_3.1.5-core2_32.tar.gz 410492 SHA256 e7adab08af2d96eaa9fd15743c66118b9d5a5bd018b9cf2d7aa3f1b56dd0f82c SHA512 431a9d0a35e7f966e52a4ca7d0c5e05753eeb3b714d6847600714d55959724ab745bceb0915c571382ab38bb160b9035b509325ba77e6fcb97623e7df0160044 WHIRLPOOL 9dedc30ecc48eac7a3058d0cbce5ad5b6c678a8e290d0d1f2e65e6e0b2b38d79a36347cbdba4ccc37547c91478d2e222416d27e12e5934413c6b98c6fef87c5c
-DIST codec_g729a-11.0_3.1.5-core2_64.tar.gz 464466 SHA256 a0f6b51ce186174a5a6d326075c5f6a06897fc159487aa64ebcd25eb1a591343 SHA512 bfd67de08e81301d46f708575d1cb0c97daee3cb004eddb9ea0eb0c72dab803147eee4bc6b4a0c9baf766b5086a1dacfd0d360def4960289b8c69c89a2d25534 WHIRLPOOL ac4149b45ed334b4b44b0111c460989153cc7f9af7ad457af9e13b111feb1c861471dabbed7fd03aba2ce86ab85cd728cfd659fc85143ad002830429453b43d6
-DIST codec_g729a-11.0_3.1.5-generic_32.tar.gz 402872 SHA256 dbcd92d9cfbc6bd807634bfa9f3535203532f97de632ab2b979f043819a33f69 SHA512 ddb2023c5f6d02238d42dbadb1b2b3d28c43a046eead3db7651ac5b5db6c8b98c49bf948f41b0bfaef5816f2c391764ed511f9fe49b340dfd1338529b25f0dde WHIRLPOOL d969cc7632e01ff95e86ad49fbf693b6c6a92c1e5aa3b31f51432e66f58a28c09d0f4b00be90490aac978be89550978794674d2fbabafa128171cc4c094b28b7
-DIST codec_g729a-11.0_3.1.5-generic_64.tar.gz 464215 SHA256 6c8feca459d1309904b5f7f712874577e0ac7206fe062c702a7671c07fb7153e SHA512 6c08626f8e0b3e7e0431c8cd10bc3192891272261c23a1aa4e43647a991c6df4b503da54a4dd3b3e446f1ae5a2d3d0ff2f9890f51e8c321a1ab40ca7fd418285 WHIRLPOOL a9ba2e6c1b8252e79aaefe18da9dd9b7cb643537c24895ca5ad8edbd5b31fe211705184a7c308344c338f3226c450350dd58dbb3dd1b599aa4f6d998282a8939
-DIST codec_g729a-11.0_3.1.5-i686_32.tar.gz 403806 SHA256 523c11abf89724e426c031bced01626ee066c61c5406b665ef306d242c7ae2e8 SHA512 b2cf9c2838fc2221ad782aaeaed4c2ab2aed94877cdc6dd10a23e064e8001b836cbd7d4a0c013500f67162d638040fa7a695a9d0b14ec22b421c01dc0a0065ca WHIRLPOOL f01de125fa66f6a3a71f0e935db78fef4b217384cff4e39f22dd9609332ebcf697fb6e76ef44da52c55678f3f4a2f9138c80809ee60d5881def08f0dd26d4dd7
-DIST codec_g729a-11.0_3.1.5-k6_3_32.tar.gz 406282 SHA256 850ba147bd0b11483ffa39d1b4bb3b5b2ea887b4688249e931c5413712a64b90 SHA512 f5ae04daa4b110b003b98d2d448db8bb370e94c291423f1b324839aabb01cbb13921edc6e9b56684456086f075370ed033074c0d9d72741b736720d01c2cd294 WHIRLPOOL f0a4191f5bd89a04af2b9547b6de3e6b4effad626bb6aa50d8d601fedc437f5d4e439345539cee1e21b5e470dedd50221161c96b083816a4cb82f2e8e792fb93
-DIST codec_g729a-11.0_3.1.5-nocona_32.tar.gz 411116 SHA256 965ff6a520dcd00f6a49a264491c82f01a05f20a62c9ecc96dd73c4eb4bd3d0e SHA512 537a0b68817a76984cea335cb3107850c4addbd953c154678f63d91957d38ed5398035ba9aa302d141a6356a4de4cc439193bd069ec3a14a3831e3e1333d298f WHIRLPOOL 4a74b42b5dfd8df356e6cd92cd170501b8ed748954e20c191e992a131ae8368e3f3a92b183b569539f14def53e7af4a378cd078444a3e967bff7628aea35aa0d
-DIST codec_g729a-11.0_3.1.5-nocona_64.tar.gz 463088 SHA256 5bfdbffca9d60785a807bb336ad75a0f98241ded3ae229c17347597e76fd2ed6 SHA512 191f2f479188b3f681e18503f44a92eb48294c2f85bcea80d43bfc75f01a4e66a02ff19e09b6712b06205389946ff333c842773bdb9cf41874c117b7c3947780 WHIRLPOOL 9a0dc965f75abf6bdc2e8c5547440d8960519903012e207a8c358a47eb1616504c31c74bd5abb593f589faf1d5d6cb2ce715b3836d533fd3df89dd138728a73b
-DIST codec_g729a-11.0_3.1.5-opteron_32.tar.gz 413573 SHA256 2efebc3320b8830606c217b208e95597049ed3a82ec8caee47a7e0325bf2309e SHA512 a16d26db435860f27fbd2cca1025a118c838340f8efe48fc73e0a51d203b7499119f14fb5bbb83e16bb34e3865f001000676d523659b4c140c99bae0dee6eb72 WHIRLPOOL b613d50e1c258f8ec7feb1e332f76b7cb292ffc62be3de47533e16f1f2d66d9f9c46e4fc0b4c4ef35c265cf932b12f23b9d812c84aa8126ed64fbf3311f5d1a2
-DIST codec_g729a-11.0_3.1.5-opteron_64.tar.gz 465658 SHA256 2a95833ed76dd8eafa69328f54a94cc6167ab4787e303faf26017ca8fdb5afed SHA512 54f1f739b8a078a9f7c7a457ec80a52624fad6278dedca76f37ff1be3fe507b9aa2e5fd033b8ca5eb99026a498185c85a0ba044c543bc6a6586280da304787e0 WHIRLPOOL 88b73f4aace812fdd0d78bb62f9170ffa49867198b3276756eb21969a52c4d94a1668aceefa12bc13e5b5cef9fc7e23735609dd58cd283ab79722a3cf07b75b9
-DIST codec_g729a-11.0_3.1.5-opteron_sse3_32.tar.gz 413509 SHA256 d16e030692b820a3c1c32b66569390d7b9a53e9836c94ffffb8ec8f6221a8033 SHA512 ee6afd47b11432de5bd22725776906be69e3835412ec143d7e8017395e46ffc83c7ad412a167606441a2e572adaa27a71eea2f64a91d82634015aaf09cf09dd8 WHIRLPOOL f9d6fde85d94e787fd555d017195f786a0978850fd1ad18c7e1f0cb9ff873f81f0f7007499533b6d99b65cd012f06bfdef795a7e899f94e9d71dfbd73639793e
-DIST codec_g729a-11.0_3.1.5-opteron_sse3_64.tar.gz 465591 SHA256 2a3322da37baf70e53f1332012a15cf258783d1d9e0fec9eb429d3b7f4a57b8c SHA512 91bc192b2feb3bcd3f9ee1e6d338e60a7e31f6c6af132597694406f44c4bc697df6e97f9929c2a03731e93e9576ec81194eacd21f883b7aa078d402baffbc3a4 WHIRLPOOL b7af18a6aeb4f2d2a3ae865d5d484361de6eb1d141d4cf460845941ad94f2e46f8569740af4a316bcaff7e5559fc90ad3e1c69b5c07815ff4bb1f9f524d19cef
-DIST codec_g729a-11.0_3.1.5-pentium3m_32.tar.gz 404457 SHA256 7c24726b038c6cbd1a23ddd79e4746a88a02a242365c6271249f42e3375a2040 SHA512 106e4c3be4784f13e6d599cdabe99ed7ec1f4d1d339da96055db4d012074bfca04cdeffb50d88dcd02b0d8eabee08ff362d532d3572723fa5e3d1611af49f436 WHIRLPOOL c1bcb45c046b257b4afe2d6ac6fb5548cdd07d6763d36c4526379e3409b8253f88bed741e40229d5ddf4d4963e495ed71ce0ce52584b0cc439f600904f8f7d89
-DIST codec_g729a-11.0_3.1.5-pentium4m_32.tar.gz 409011 SHA256 5e81fdd0a6c36a5611aa1720eed4b61fc7c00e2a5af3c9bde0690f68b532e229 SHA512 83a37a736edfd4a5d03e22983573e216da0e2ddb2a44054b94d43642932ff20afa1b55858d3be2f0197c24fc8a1e81ff2c7826c1a959a058669e9104a7e92151 WHIRLPOOL 2770511c965f9227113584ebfe65b191989c3211767c03afda96a2fb8c380781124dcc57f1360710edb3a4264f30f9ae52775107522c48180de07be0b15ac1cb
-DIST codec_g729a-11.0_3.1.5-pentium_m_32.tar.gz 413125 SHA256 7df3f2de56c5791537d23f7f8819318d6974f77bb887305b9f7f4af580b9ce5c SHA512 d1531d3a11ad8dd61d72364d63fae2e1bcb2d35984c70deb240e6ab513264314f00d74108f0f46fad2ae52b1deafbccbfc4153445362410ec646a2df5de94391 WHIRLPOOL b55951ca4bf95ad508dd7e687bed4ed73a3639c4053b119527776304fdb490543384c3627972e7f850845c6083a4a6f73631c98b1786acea4e3d60ca7998ffd7
-DIST codec_g729a-11.0_3.1.5-prescott_32.tar.gz 411126 SHA256 ccf75a1793bd851f33547f1e5a2063741768976b0d804b0962eec92b66a72247 SHA512 9ede6d14a2b0ea7bb5094dd87c7943e582dd3e49dba564131a0382e9f645ccd35ba85c96288124860e405b030de4f6a717124540053e897b2e4d5de190feebac WHIRLPOOL 556ce3f8224c3ff6b6f4b68da1aea5a1a5daa287ab761851c9d3897769a710aa4f9cb113f0be6a53c5eb3059302c4be86341f379080caac1deecac5265b4a63d
-DIST codec_g729a-11.0_3.1.6-athlon_32.tar.gz 397172 SHA256 e16bc44fa1cfae0a40fe01d3efa28a109eb256810823245dd39f74c99a3fe5ad SHA512 a08a482d686790e66bdef49a31a2b79a5a93f36565e77d7514123382ee9fbb6c1ecee48d0608a349ebda8c01b524280010da6bc03ddf206061d6504451624f00 WHIRLPOOL aadd4b88bef8d683e65b02f693e79d7fd5e064b68aac3df260d05f2961838c63eb026c36299d1a97345a8677812359dc1eca4e9049bfa130927a8c1c645e2259
-DIST codec_g729a-11.0_3.1.6-athlon_xp_32.tar.gz 397179 SHA256 6fd3c9334f1c57ec6ab3b02072a5cfe6b88d14c1da7a85f9b6e3ade89fcfd8cb SHA512 8de895251fa76fbd9b0b2d93f365aa4cdcd514a0bd00dfb9af661d5ba50849a9d3c7cc44dbd2bb4256dddf61307d64744f90a12f012ae8292b2827fa8ffb7c95 WHIRLPOOL f9b99b91db9e3b992b4609e64864661060df4f01367133d7ddfd61499e6c4e95fcb5cf407ecbf3ed34182ac92bd90bee628fc96d65618e088e28659d13c91aa0
-DIST codec_g729a-11.0_3.1.6-barcelona_32.tar.gz 397215 SHA256 2ccfa65bec2d41e32805043a075198680b16a962c0a243898ca83a371a59d606 SHA512 104a66449ad2453e68f27f7d4d6f80d12b2a186387ac39b90094a916dc1627e42e2c8829dd4c228a8f3bb0a40d71e912e01eba79c6330e4cb5c3d0a6a95db133 WHIRLPOOL ee0f0009cc49a583f00da05cec9bee6d7e8300bd34b2e2ece5dad1b6eee32b9210caee0633ef5cce9fea93f9b65a171a29f452483c93e6af555416efe4322c8c
-DIST codec_g729a-11.0_3.1.6-barcelona_64.tar.gz 453437 SHA256 5a9eb3febcd91bb26a3aaa0068493d7bec782db3547fd7e3e1683e4b9258ef41 SHA512 b9079f27f84a63e1d863af9589af848fbe052c9e9d31e65ca2c3b08f76e5afba76b236e9f85281f98d83d8082342807578d8ff183a4f8df18cd0fd7a8ffe8ae4 WHIRLPOOL b6fe69dfadc4f79de45110e4e8e0c5669b43cdc4f0527d8799a24de2e5136f577044cbad27694e81b23fc0dee09ef364cba9a8f6666c060db71f7f7d76a713a3
-DIST codec_g729a-11.0_3.1.6-c3_2_32.tar.gz 397547 SHA256 18f609b8086fa3f68491b9b66bb77d9608aa1818da2a4686d8e4fe7a799b03dd SHA512 6503920db56914c4d05ee23827d91387a5af85e7ea2524bc8d6c46250d31d126a54b422a092b0ef80418511cc1e63f3a603cab46623cc07b6be87353d7b3ffa8 WHIRLPOOL be80095af5344e320730df4af68d86cf5cd6486445248cf88d2b68ef0dc9c076bbe7627c76d55acffea39643731dedf835aeae9818c851b700e514aee17b1c13
-DIST codec_g729a-11.0_3.1.6-c3_32.tar.gz 397306 SHA256 9780e6488455ae6540f731cf3cb5bae09dd828e7b8913c78f9a8684f15de9cc3 SHA512 1e68ffe81af906ad93c8bbc69349f9e81bd6562cfe5d39251e4b7d51df422058f71b6d856b733358330242b909e156787cfa0c086ef5adc50a8dffde7fffe446 WHIRLPOOL 46d808ee4e10ef9eda92cbef9dfe46c037bb41b4c54b2e278b1d800dcbd29aeebb8f8046b78220b2aac6ae92886efef028ea43d03e14abc84084f3a8b1433414
-DIST codec_g729a-11.0_3.1.6-core2_32.tar.gz 397176 SHA256 8c9f3dfc60e3597eb24e887310f1cb9077284b2f3b0b1793e36e7d6e1bbe2af3 SHA512 1e1fd5edf26a5be5fa70529bcdc658796fcd8145ac04d0a8561552e76c48263b8194b02b9ec98893bcc5d73e34659ae45b289bebdd1e8e328683ba8f1642cc4d WHIRLPOOL 03d11b05d61b58f1d2edb1c804eb11a071b5995941b7f4cd61da28f3aeb16db332efd1c9b0adc32b2c3825590f345ce67d0f81a3f1d7daf436125aecf1ff8a93
-DIST codec_g729a-11.0_3.1.6-core2_64.tar.gz 453545 SHA256 0875b54e3f7e894c7628549c3b900813fab19a16ccc0d4399612542f40c1e8ad SHA512 813bff86d19df1458e62a4b0b65421d0d94acb99afc1c80c7f8e12aa806e67d6f432c88290035ed8225993cd54a6ac9fbadf90fe67b5a2cb70850e1f404212e5 WHIRLPOOL aadef598d98c7371f21dbe6ad75cfa4fb647fb7ad76dafd13f00fe1934bd9efff6f620c802e4a3a322e45fc867bc0eb53fef01030d569afda7c63f4310baff67
-DIST codec_g729a-11.0_3.1.6-generic_32.tar.gz 397190 SHA256 23954c6dc5be6ef6b510fa2ceec248a47653497d7e2cd65a28c2c65f57bee874 SHA512 76e38b9ecc8aa6449f499185fe3aeb98bcfa9aa4eb538807b20936d9e233a94ded25ba589ad9782071845c522c465adb1a41a63eec4b4ee714cfef36a9fe23eb WHIRLPOOL cf7181681e86e8f2eeab94d7a561c6c21f8995e181517eb08b71080dbfbbe0cfc4c55e4a6ec2135d32fdf4aa1a15d69eab5ea9e7d30f7e0587f59a0ee1c25bf4
-DIST codec_g729a-11.0_3.1.6-generic_64.tar.gz 453604 SHA256 72caf518e187dad98f4460d3e2100f83b5fe9e63b8a52ddc5f9c4ac7ea518b38 SHA512 5b66df2362b131d91f5a0b95b2ffbefde8f3b68e1f5e6b6c860666afaa4dd73e17aa5f3b942db0828c065af5124506df478d3e4d2b6b2965b39f7a80790b736c WHIRLPOOL 34a437791546c7ef0a861a2c04c33d4efe7d94592a19c7ee2d43d2a0b51e28145be5f75515afcce44aae5f7783a60d3cace1028bbfbf312f31e188ddd5dc8e01
-DIST codec_g729a-11.0_3.1.6-i686_32.tar.gz 397196 SHA256 012b038cc9786557b0a41880a8a95f9d609c00e2923284332709ef8b9b35214e SHA512 802e41b88fd1115addd45e8706a93858375f1efeed899e7102e27eaa97b07dc25c0467ef61257d23f855bc7f37177c731ca16ba61a95f52e3153770406bdfa8d WHIRLPOOL f72f9fb249c444ee4c0f290f7449e09272bf305ced5940adff4ad61c09a84106f6c71c68287890f58b4d298ae576437cf19d0198ccd2fcee4dcee842211a7bb8
-DIST codec_g729a-11.0_3.1.6-k6_3_32.tar.gz 397323 SHA256 d2f478cfc153ecdd2c69e938d7dfd41959ad756cb47a94e252cbf54a52b1e2bc SHA512 ad90f61538e0ad5eb485b35bf903e897de494daf9cfe6adc13aa5dc8dddead9a6fa4fdb05ffb8f364c53a03c1a7b7dc35e69fc6cb985b06a3943e16f3b9ad3f0 WHIRLPOOL d6e3b84d55051d265ab22f040be0b8d9782bc8fee845699efad07adecb560dc3104883ab2cc0c13d700c5d5cd5eb19eb9149b62d1d3d331d861bc1e704f0efe1
-DIST codec_g729a-11.0_3.1.6-nocona_32.tar.gz 397143 SHA256 653ca1f1cf60b9e2b142af459e0da1006e0a11810fd39877cbbe9c8e61c12f46 SHA512 0d61a03ac74a79f1c3fcdb6908ad0bd7c8dc80d94dc0d95c5c875ffa46635931b1c227f0e9f28469e9f5ec0cfac1d468c54c8c0b23008042b2990f7ac501d495 WHIRLPOOL e41007369e8ab194f61788e0c19a35c1df867386277b4e7bd9470d30d266eca675e6b50dad6c38ea16b258307d626efe302a908bbf677d413da2abbc4f80062d
-DIST codec_g729a-11.0_3.1.6-nocona_64.tar.gz 453296 SHA256 88183f53ae82577d3188e7de772c485c3434417f135159d96cf20ccb6d2a81b6 SHA512 b6fa29d4ad00842f746bcdbd8941eed6aa96b285413f6561d31b8bba66873a3ac0a25891d27714d6bccb91fb760d078d9774ab9e2a6af94f83dd80c0486e1f60 WHIRLPOOL 52f78e4bd2752e414a70c7b91bf6e88214e85d956703e328b4693bf378093229cf494e2758b1378a01e11332ac0d37dc4df8de4243b634b9c6db453e3eaffcb4
-DIST codec_g729a-11.0_3.1.6-opteron_32.tar.gz 397298 SHA256 e650bb33fa595a0d79c527160c3bbe060a0d228ab661d26d9004459930eedceb SHA512 9dea626643607b31ae5af8a2df804fd13449aec497972bbc5ff0cd95c83c976703d8776c71eef46f298ff54b3e0c9c98ec2a5ced42ece7b2391cfc72425d11bc WHIRLPOOL 89c933ad2b2457b3fc12f145e11d3a901605f78cd1d00434bd8be6f2f52428bcf38f096991bcd65f3329c2df55b55dee6e318076f98b9fa8fae994237ede80cf
-DIST codec_g729a-11.0_3.1.6-opteron_64.tar.gz 453554 SHA256 5f15361e2a954783a31ea93142bb2b997c03eefed5f20e6195a239c5053ba712 SHA512 fd4862071f1d3cf03d75c8ccc54c6ef8b0e5f3b13fca54bc748748dd85811b0e22bcff44b3515d219f4fa284174d202d7ab53f6d677b77e360018bc202fa5c18 WHIRLPOOL 5b207147ed2960bebe66da1017016f7bf4a096c2274e737dd18340c1bf88bcf47fcdd1a930d61612dfbcb8d7e134bd2982019d58705b286198bc194cc96fc839
-DIST codec_g729a-11.0_3.1.6-opteron_sse3_32.tar.gz 397309 SHA256 304900c653a624ca75412ac96c5659f0e9eab1e8df9f1a6b7c915a704ca930dd SHA512 f5bc219f183758b3ccc2175678febe3fd57456db08b487ddd3e8f215ad70f188331f9fd61423f7d3daa1dcc70e849ebe8597bed5f508735ff3a50a66f6357502 WHIRLPOOL 8efe83a12e80d41fb8d7d09c3a88469f97c1cd5d07613f87f0db0c4f4c458723c4bce0c7ba95715767b25182f43e2ce6c499163bca17e10aa1c0f0bd5625764c
-DIST codec_g729a-11.0_3.1.6-opteron_sse3_64.tar.gz 453555 SHA256 85597bcc21093b82d0664e47ceeb28ae83d69425c3a3e1ee6ac0af2d10531ac2 SHA512 e413f5a21ed3ee425dff31d246f96aa771bc52149c3ea6103939e6717fce44edb293d78473c3a49df5747cf5a166e35e5ce5d6a1227fc96297eb8d657711db04 WHIRLPOOL f3bc1456bf3821848674082fe10fafc996a8c4ffa12ddbc5ff406e3d5d7fefa970eed454c631a183fe337ec7e1bef1988093bedc61b33fc218f48c35c5930024
-DIST codec_g729a-11.0_3.1.6-pentium3m_32.tar.gz 397551 SHA256 4a3e0e81b442ecd33246a9221e530b0fedb47832de2555aaac11c29f454e6910 SHA512 776749afd3ad82a924247aa27876dd80169d39411e15ae97b145922b31e0f4713d3a23099063c7d93e98378f79924e61cd8bae6efe1918955048d1ef286e21f0 WHIRLPOOL cf87aed9f7b09603526d1123c40ae2aa880ea5a7a1019a5ae019e5395d9fb08903de8988996321e3c1b8fb5e09087f03aa1b035cb2357131faba8bd411d30456
-DIST codec_g729a-11.0_3.1.6-pentium4m_32.tar.gz 397066 SHA256 52a5e0b699b309febb2c44e1f1c57fcfd297bc6b3e8f6eb49607627d563fc802 SHA512 8f875d442c698013d43b407d805a84a6d0a5d02bb89e0d5327601b157f58d0f5754d551e4cc28ad43282389c762349e17711c2fbadeb6375159983d0d953335e WHIRLPOOL 1cfb1e392f0d40861fc9faad5f3dd701bc963dc7be038ff0f93cdcaac21c5fea9ba263c72642ad6e407d3ff4e061e85c51d825bf5cabd96cc98a6a465ade437d
-DIST codec_g729a-11.0_3.1.6-pentium_m_32.tar.gz 397552 SHA256 c3065fd37e557b387a9701f12caf9a37af8876ccf2d63d2c618b227d36b093f1 SHA512 1cb5a78e40fdb4fcda87efe3eef5d94e1f8b12699a702964f87ead1e7c5eea9e9ec18762b85a3c14207c731b9afa40c0b65eca23ea4155d5f7048d199843a6a6 WHIRLPOOL ead35bef10671d3b29d6b447d633c9a4e781fdda5337732a2c435150835f94fb510c24d668c5265487ad93feba042b1e50e0fae045ecf55228910e8b10b4ca2e
-DIST codec_g729a-11.0_3.1.6-prescott_32.tar.gz 397150 SHA256 4ffc84f3818f8dcf052b96994897affb07951ea1fbda2941a7135898d3af33db SHA512 2d6269232dc2e8d8f9b283ec374035378b942615e36f86e34e40f910b43e69460e461eefdcf27ef35e36f8164a8ea001f74b72093ac1183ea0412912279c2064 WHIRLPOOL 18666af084af6342e7e9e3cc03cc828a43bef5c9608375e3a190a4f8b8114e78d86b16ebd077f4f0c14e09a47f384a4e8cf98b46c77ad72dafb1b86ddcc807bf
-DIST collect-g729-stats.sh 4857 SHA256 901aeac3b3b5e11d8ef983820d1761cb5404a9240c9500f59e670ced2966c074 SHA512 82887e07dcb6177ce0fd11ffd5f47b985f2f65c187ab7bc892b2e9fb9527f0fabbc389b3aed1ed2bcfbe1cb04d3eef518007acc46f9f022e2898694480639431 WHIRLPOOL f6ca60583a1b14ef45f8b27efede5a836e42713810877930944ff0ba718c6d79b3355af56f2e28c7f59944ca386283ca6dae46034bca33178eb61a3a4f6b7745
-EBUILD asterisk-g729-11.0.3.1.5.ebuild 5688 BLAKE2B 9ba547f407293c4c9591d3041e9957665e24b596337e9b3059447b8e841ee5899e17c43eb5d00d1d41cf1fb50c368d6080f56b2998a6285b0b1daf987b389417 SHA512 68bd41a3ab71bc8f13adb445ba3bf5657781923f3d8e8856debc642449899ef15c06745c122b2c6f0524b51bdb5ef3022129a34225892cf08e2002a92c1d8b3f
-EBUILD asterisk-g729-11.0.3.1.6.ebuild 5688 BLAKE2B 405abb8908c76d040ffdf7e1e6603411447baa6119af23f03018a77a9f399ccbde8347a4aafffc0896996026bead18cb93de5597c825722050421ba7a930dbc2 SHA512 31db35647eb1f1edfb73dcdadaedee29f1544e0a64cc89e7386c59b90440b816414872a4988d119c053f2d4e4a0db155b03cf077c888b33ebff6987dfeee0485
-MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
+DIST asthostid-x86_32 1678360 BLAKE2B 0caa098d9891cad9301bbc074d8ef8e0229ef3432c1f2328247e73c8248949c1951b61f47e0c395f0f6dee870d0962f9d5f612fd5565b43a3fbec1b198c6324d SHA512 9047533e47d4a806683368c0c432eb8699635dcde528adde7a34461f2104bf651cfd394a4b51c52c931f8bcebb7b41824c1db510996d20fb2d67e991ac0b63f8
+DIST asthostid-x86_64 1806296 BLAKE2B cd2e08ee760374f781d79a952679dc7d54f83dbd3f9a63dfe8fe4f36ea74c19c4a0486d459a5cb90877111100dd6e147bc701489e38ecefe585a4473147a5886 SHA512 be7d7b63259d5c4f15e6b3a55b283030bfc3f4ccf59c58848a9803838f7aa2ff470353a4d78d289bdcd40213c0cc81fad31e2bfad690fcaf111ea5cabae5adfd
+DIST astregister-x86_32 2103608 BLAKE2B 7fdf1c196152612cd28cfe7bf832dedb625b392f5e919480b1fb792327474d6ad91abaf4938ca8b230a1226bef62652e16f8d8ac1d0dad338fe308b3582c72e8 SHA512 3c3c4b8a32143d1aaaec6ec6b308335f59cf5381f844412e4e484aedc91bff2601778c28e99628fff828c81d2ec05b4de7c8c1cdddeea3ec37f5331beff47a2c
+DIST astregister-x86_64 2193440 BLAKE2B 9c9ac2343f5d7291251b9ceaa00fc4f8e4c39673e8d4854f8743beee5c86bbbc14c802c34ff26aa8412f1219113edeab7cb3b7adb94086c2f63724095d9f1fc5 SHA512 9302a7ead6bedd6683bcd0da92b7a7ca54fdb975784ef1783aa99f2bb26424dbb77b4c0fa6b809ae6e6ad839807feb055bee5c03a38292737412aa1c3d7df4e4
+DIST codec_g729a-11.0_3.1.9-x86_32.tar.gz 411132 BLAKE2B 6325763e27c25ab101ec825f08e8ba86a1b42dac1e75e792dfd1467a03909523097a6cb5c92233e391b293069e7bed7d23cd955329653d0730f529a6b5a1495f SHA512 3426e0ce15cba5866c1ef8f3c692237f6910ebde5740cacdf27e04f110caf7f289834eb8dc793dd4fa50ec17854a2ebad19764d9c485221e0237ac207ccff991
+DIST codec_g729a-11.0_3.1.9-x86_64.tar.gz 478377 BLAKE2B 409cdd436b0cf11c8d68372b1b22f29ed6e2d9f01d77ca8494415c29e89e88472c126461e9d124661dbd4ef26725301cbc3bb859884ae02592ad583a37608896 SHA512 f97972e4afac2897162cfce7c49423a36d313801246238e3923993e04a2add020028a509c11cb1f4f39ec612c4243007fe564438cf82e1c71543a44bf0bbd2c8
+EBUILD asterisk-g729-11.0.3.1.9.ebuild 2442 BLAKE2B 6f547bee4271afa16da4d947484b44788174efe66ed503bddb0488427a91a37f7318408543655994bd2d2ebbc8ae1064fd2e1103ae2557860a206aef3ab63506 SHA512 59b5f3dc0e4b14f7bb1c67198a345a9ed1c91130d521ab144fd7e2db38761dd9fc03d79d84248d1ef59306fb974a3844fa3bdd348b897d215be60b121821fa9c
+MISC metadata.xml 245 BLAKE2B 94154a8bdd62b19999d65d599876471c8e44c02209c12a20d75667a21eb873ad59b42d27536d54ff1274d57bad9d73d81eaacea36b8b02e01b40b9eb5e6c82d4 SHA512 c3c7907e50537dd94fdcec1da306eee2f050e5a456d369cd3df8c9bf36c810d811fe547418a8025e533916eb52a742d9feafae647b2957820d99ed962dad302e
diff --git a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.5.ebuild b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.5.ebuild
deleted file mode 100644
index 9fb828d43d01..000000000000
--- a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator multilib
-
-DESCRIPTION="G.729 codec and supporting files for asterisk"
-HOMEPAGE="http://store.digium.com/productview.php?product_code=G729CODEC"
-
-BENCH_PV=1.0.8
-
-AST_PV=11.0
-MY_PV=$(replace_version_separator 2 _)
-
-SRC_URI="x86? (
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_xp_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-barcelona_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_2_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-core2_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-generic_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-i686_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-k6_3_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-nocona_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_sse3_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium3m_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium4m_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium_m_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-prescott_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-${BENCH_PV}-x86_32 -> benchg729-x86_32
-	http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
-	http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
-)
-amd64? (
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-barcelona_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-core2_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-generic_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-nocona_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_sse3_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-${BENCH_PV}-x86_64 -> benchg729-x86_64
-	http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
-	http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
-)
-http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh"
-
-LICENSE="Digium"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND} =net-misc/asterisk-11*"
-
-RESTRICT="mirror strip"
-
-QA_FLAGS_IGNORED_amd64="usr/lib64/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
-QA_FLAGS_IGNORED_x86="usr/lib/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
-QA_PREBUILT="usr/sbin/benchg729 usr/sbin/asthostid usr/sbin/astregister"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	local binsuffix
-	local b
-
-	if use x86; then
-		binsuffix=x86_32
-	elif use amd64; then
-		binsuffix=x86_64
-	else
-		die "Ebuild only functions for x86 and amd64."
-	fi
-
-	for b in astregister asthostid benchg729; do
-		cp "${DISTDIR}/${b}-${binsuffix}" "${WORKDIR}/${b}" || die
-		fperms 755 ${b}
-	done
-
-	cp "${DISTDIR}/collect-g729-stats.sh" "${WORKDIR}" || die
-}
-
-src_compile() {
-	./benchg729 | tee benchdata
-	variant=$(sed -nre "s/^Recommended flavor for this system is '([^']*)'.*/\1/p" < benchdata)
-	[ -d codec_g729a-${MY_PV}-${variant}_${size} ] || variant=generic
-	[ -z $variant ] && variant=generic
-}
-
-src_install() {
-	local size
-
-	if use x86; then
-		size=32
-	elif use amd64; then
-		size=64
-	else
-		die "Ebuild only functions for x86 and amd64."
-	fi
-
-	dosbin astregister
-	dosbin asthostid
-	dosbin benchg729
-	dosbin collect-g729-stats.sh
-
-	dodoc codec_g729a-${MY_PV}-${variant}_${size}/LICENSE
-	dodoc codec_g729a-${MY_PV}-${variant}_${size}/README
-	insinto usr/$(get_libdir)/asterisk/modules/
-	doins "codec_g729a-${MY_PV}-${variant}_${size}/codec_g729a.so"
-}
-
-pkg_postinst() {
-	einfo "Please note that Digium's register utility has been installed as astregister"
-	einfo
-	einfo "Please consider participating in the G.729 stats collection that ULS"
-	einfo "is performing.  This will assist in picking better variants for more"
-	einfo "processors as we gather more statistics.  All you need to do is run"
-	einfo "the collect-g729-stats.sh command."
-	[ "${variant}" = "generic" ] && einfo "You are using the generic flavor of the codec, in order to install a more appropriate one please install a G.729 license and remerge this package (${PN})."
-}
diff --git a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.6.ebuild b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.6.ebuild
deleted file mode 100644
index 719381442d7f..000000000000
--- a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator multilib
-
-DESCRIPTION="G.729 codec and supporting files for asterisk"
-HOMEPAGE="http://store.digium.com/productview.php?product_code=G729CODEC"
-
-BENCH_PV=1.0.8
-
-AST_PV=11.0
-MY_PV=$(replace_version_separator 2 _)
-
-SRC_URI="x86? (
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_xp_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-barcelona_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_2_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-c3_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-core2_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-generic_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-i686_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-k6_3_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-nocona_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-opteron_sse3_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium3m_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium4m_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-pentium_m_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-prescott_32.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-${BENCH_PV}-x86_32 -> benchg729-x86_32
-	http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
-	http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
-)
-amd64? (
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-barcelona_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-core2_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-generic_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-nocona_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-opteron_sse3_64.tar.gz
-	http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-${BENCH_PV}-x86_64 -> benchg729-x86_64
-	http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
-	http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
-)
-http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh"
-
-LICENSE="Digium"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND} =net-misc/asterisk-11*"
-
-RESTRICT="mirror strip"
-
-QA_FLAGS_IGNORED_amd64="usr/lib64/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
-QA_FLAGS_IGNORED_x86="usr/lib/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
-QA_PREBUILT="usr/sbin/benchg729 usr/sbin/asthostid usr/sbin/astregister"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	local binsuffix
-	local b
-
-	if use x86; then
-		binsuffix=x86_32
-	elif use amd64; then
-		binsuffix=x86_64
-	else
-		die "Ebuild only functions for x86 and amd64."
-	fi
-
-	for b in astregister asthostid benchg729; do
-		cp "${DISTDIR}/${b}-${binsuffix}" "${WORKDIR}/${b}" || die
-		fperms 755 ${b}
-	done
-
-	cp "${DISTDIR}/collect-g729-stats.sh" "${WORKDIR}" || die
-}
-
-src_compile() {
-	./benchg729 | tee benchdata
-	variant=$(sed -nre "s/^Recommended flavor for this system is '([^']*)'.*/\1/p" < benchdata)
-	[ -d codec_g729a-${MY_PV}-${variant}_${size} ] || variant=generic
-	[ -z $variant ] && variant=generic
-}
-
-src_install() {
-	local size
-
-	if use x86; then
-		size=32
-	elif use amd64; then
-		size=64
-	else
-		die "Ebuild only functions for x86 and amd64."
-	fi
-
-	dosbin astregister
-	dosbin asthostid
-	dosbin benchg729
-	dosbin collect-g729-stats.sh
-
-	dodoc codec_g729a-${MY_PV}-${variant}_${size}/LICENSE
-	dodoc codec_g729a-${MY_PV}-${variant}_${size}/README
-	insinto usr/$(get_libdir)/asterisk/modules/
-	doins "codec_g729a-${MY_PV}-${variant}_${size}/codec_g729a.so"
-}
-
-pkg_postinst() {
-	einfo "Please note that Digium's register utility has been installed as astregister"
-	einfo
-	einfo "Please consider participating in the G.729 stats collection that ULS"
-	einfo "is performing.  This will assist in picking better variants for more"
-	einfo "processors as we gather more statistics.  All you need to do is run"
-	einfo "the collect-g729-stats.sh command."
-	[ "${variant}" = "generic" ] && einfo "You are using the generic flavor of the codec, in order to install a more appropriate one please install a G.729 license and remerge this package (${PN})."
-}
diff --git a/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.9.ebuild
new file mode 100644
index 000000000000..55994b2777f9
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-11.0.3.1.9.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator multilib
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="http://store.digium.com/productview.php?product_code=G729CODEC"
+
+BENCH_PV=1.0.8
+
+AST_PV=11.0
+MY_PV=$(replace_version_separator 2 _)
+
+SRC_URI="x86? (
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-x86_32.tar.gz
+	http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
+	http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
+)
+amd64? (
+	http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz
+	http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
+	http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
+)"
+
+LICENSE="Digium"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND} =net-misc/asterisk-11*"
+
+RESTRICT="mirror strip"
+
+QA_FLAGS_IGNORED_amd64="usr/lib64/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
+QA_FLAGS_IGNORED_x86="usr/lib/asterisk/modules/codec_g729a.so usr/sbin/benchg729"
+QA_PREBUILT="usr/sbin/benchg729 usr/sbin/asthostid usr/sbin/astregister"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local binsuffix
+	local b
+
+	if use x86; then
+		binsuffix=x86_32
+	elif use amd64; then
+		binsuffix=x86_64
+	else
+		die "Ebuild only functions for x86 and amd64."
+	fi
+
+	for b in astregister asthostid; do
+		cp "${DISTDIR}/${b}-${binsuffix}" "${WORKDIR}/${b}" || die
+		fperms 755 ${b}
+	done
+	default
+}
+
+src_install() {
+	local binsuffix
+
+	if use x86; then
+		binsuffix=x86_32
+	elif use amd64; then
+		binsuffix=x86_64
+	else
+		die "Ebuild only functions for x86 and amd64."
+	fi
+
+	dosbin astregister
+	dosbin asthostid
+
+	dodoc codec_g729a-${MY_PV}-${binsuffix}/LICENSE
+	dodoc codec_g729a-${MY_PV}-${binsuffix}/README
+	insinto usr/$(get_libdir)/asterisk/modules/
+	doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so"
+}
+
+pkg_postinst() {
+	einfo "Please note that Digium's register utility has been installed as astregister"
+	einfo
+	einfo "Please consider participating in the G.729 stats collection that ULS"
+	einfo "is performing.  This will assist in picking better variants for more"
+	einfo "processors as we gather more statistics.  All you need to do is run"
+	einfo "the collect-g729-stats.sh command."
+}
diff --git a/net-misc/asterisk-g729/metadata.xml b/net-misc/asterisk-g729/metadata.xml
index 5087760546f6..1a06e96ebdc7 100644
--- a/net-misc/asterisk-g729/metadata.xml
+++ b/net-misc/asterisk-g729/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest
index f88511cc64d8..907269cf5025 100644
--- a/net-misc/calico-cni-plugin/Manifest
+++ b/net-misc/calico-cni-plugin/Manifest
@@ -1,16 +1,14 @@
-DIST calico-cni-plugin-2.0.0.tar.gz 59473 BLAKE2B c101ec612112a7314f0958045dd655f6dd77f0cd204034e568a23b71c82238d9727bb03ad15a62c7b4ee609319acc63ae811dc7c8a67a324f810c01e9260efb6 SHA512 0db09a44b36e35f3e62ef58bac60893c8dc4b00a8f95192368ab53c67d4fc771f2d501fbb68acd3f12f53e7438e101fca74178d66f143b606c6ff9a707364dc8
 DIST calico-cni-plugin-2.0.1.tar.gz 59792 BLAKE2B a7ca4799030ae83bd96291c72d46b95efff9bcbf465da41b19fe54d61503b0a3efdaee55fa086ee154fa83b8b36725ec848145fba078f107a8d3807959d60a7d SHA512 1ca447e2e8a4f95254c5433ba39427014da40febb44c29969a9e81f8a7ae62f706d9cf6b116400b7a5372ebc91954d588916808d64d9b12fcfe25fff90feec9d
 DIST calico-cni-plugin-3.1.0.tar.gz 62358 BLAKE2B 04a435b427da12f6fcd01e8713bb42f094da8de54fa33982c9fc9d4d9ab71f3b5f23e6bb750eb5395d0cf5b8250057c9c670b89121456509b1f204230b3cead5 SHA512 44bcdbc91c56c7f1610261aaf6d6bd7f0ee32bd08501ac74cf980a91c5c126903eee5c2daf6c3ccedea6396f93c4b22df1c5de247acdefb47b49c0b9a2717e26
+DIST calico-cni-plugin-3.1.3.tar.gz 64054 BLAKE2B 782847ca79306b27fffd0426b9cd7c5b8e34f39634491beafc1c652d26dd0ebd84b46116b12b3f6e8ebdff4a8aa5db52966ac62e1bba595456f41bbdb3c48fd8 SHA512 d4c064d4f7b5e65c933d6b7866ffc077e20da35ae3af03d8b0175f01f9fb87857a5c891f8e15b877e6a1c238c894a8163458197f7921d866b7a180ed52eed527
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
-DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz 173167 BLAKE2B 9aad6388fd9c307a31a37a746684ed9fc52ff556ef5209e14c2afebf69af0abc28cb9d825245b87a49fd9947f638344b92143868fea7852db0bd2bc39239a2e1 SHA512 0607a4213f1291cff03d21d6860a8830ad998bcb4c6e3489bf0a8c207137fe9b958c3c453e9cf6fe0911a219d250d89f0e8b3c457900893b9ed8bd31dc696777
 DIST github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz 789110 BLAKE2B b04688b90503cb01aa18d9c1227b7cb510846f8b42678729fb7a80bf914ef4a06c399a8f165b7f01d6a05aaf98d4e97c17675a3774745a7850862bdd609b5168 SHA512 2aa1a665531c2e6b7800d38abdec4f0b68e778ae27c638b4ab097abb720c66a4863fd1f4b59dc818b91bddbc5c7dce4e1fefddfda11881e2334d7b71122bd60e
-DIST github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz 2890046 BLAKE2B da19c84834dd044a93274720437a068b36f97e859f6251af07252732b100297e28b8dd0ff350d8954290bdca50571a154b383f3cacec04f94f548332aa922bda SHA512 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
 DIST github.com-coreos-go-iptables-259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz 11294 BLAKE2B 2e95b4c7c9836d54a004da28f6abd09d3d165055d2d1d4f8e6a67d3389b7f93fee14f30c92096d2da6f7639a602bc163df40c1f817370c481ebbf63094d8b197 SHA512 58c5b995dc12a881820f5dccadcd75cb8e6d856f34c2d33c01ff8538c0a1451b75e14d3bc675fb008fe3c4e87d1d0bfd4a27443f19dfa8b53b4da02d3de9dfea
 DIST github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz 13564 BLAKE2B 5d0227229ccb548a8978f0ff4f45d55437995ebf09d6af0f71f2fd6fb9ca6ebee58a75c0eb1b8badafd85dc79651672476b8298404dc13aaf8c602bd914a715c SHA512 df1a5c19ac8cd10602886f0adedce07629f56a055bd401caf64e9b330aa7dc40995d203b446bd5486f67c6f932bfcafe4e6af7ff6f9480ec815763bcccc374c8
@@ -29,9 +27,9 @@ DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 629
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
 DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
 DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
+DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz 860438 BLAKE2B a19c673d984177faf078a04b7351258fed56390d09bb74f715409e30a7c99b68ef1861f1890db0683370c290a4fcec8f2a1d82a01e9132160f5a3a2954b9cfe1 SHA512 693f3586a09e2149ceda3b6833154acdd7d924eb6e225697db4d103a9a907147a9b1860efbd0dcecf2db6b39f44b0e6e6414eff318ae4ccaaf36e18f505f438a
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
@@ -44,7 +42,6 @@ DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.
 DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
-DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
@@ -53,42 +50,41 @@ DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
 DIST github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz 599812 BLAKE2B 6763e5204c210f9c4762f659a863ca2333e49b3f35d516fbdcd9a68124bc2f69f464e20caecd6a84b67f4962c4325f41c52464613a687d3ed12d1c97934e790c SHA512 5533ff2a56b573b644f16c4e287d50c850203e79a82588df252df78dd3d0e8ba0bb691b7211c6e24f4ad3bf954e7941851e840fc279ab3f189f4d7096e4b8707
 DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
-DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
+DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
+DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
 DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
-DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
 DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
+DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
 DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
 DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
+DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
 DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
-DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
+DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz 400965 BLAKE2B f5516523c7f5e9491c95e3ac4f399e1aeccc13d856c565f0f6756265f30c2654df95bf78220b4f0c68dfde9e9183f39d8609b64379e2268dc2fb31530140c575 SHA512 c89799c49cba672f223900cd83994a6667ccaafa2798a3cc320761b1f28367b2e07903c6d19c901af19e7859179089510b1dfcfc068075fb7e03724e9341215a
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
+DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
 DIST github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz 383022 BLAKE2B 04dffe36eeab8fc1407ff6345bf994f4d507aa462f70c55c27ae2f0a4044a5b2ee09ff36997cb6bee5bbbc5c8574d2cb7fc1b97b8d02fc9883ab28ab17356eb7 SHA512 9034dd3b0d0f088219a3e4b0a1c73b0fb7ede3d3d5f6dd2d61fd51d5705aa9d64ea27f1d40dc6b40bc5d4514b25da73e2baf45f83232658009fca1323066e4a9
 DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
-DIST github.com-projectcalico-libcalico-go-c63959043fbfe61db5795781c7a6c848cf2cbe0d.tar.gz 382765 BLAKE2B 17e78982d8b4092df341f5100c319e3c1116b4271b227ed21d2733af6979bc2582d3321ecb372bf4d5611050f404d374c17af3e2376ccdedf6ba379010de1711 SHA512 ab6be10b9e3d6c90774c6bbe0f0e05159793755c0fca53e6f7737517d15b6028d1af5a507ee9c803edb39cefcaa241ecb96fcba0f2affb9f598ba6850d67fc75
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
-DIST github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz 62690 BLAKE2B 981efc277b38a6249cb232c2ce6f759ea7313902aa9e8edfa2e76bb793bbe0908d8b175a13248d042a8d2c611e57b278b5fe89d606e8410cd996a9f640bf94a1 SHA512 14e0e3a26c3a01e6921892559d34a6de05f8e1eb1fcb588b3f01d891679bce1a625806bf04aca16c89ca05efc907cc0ce3d06521dec30903886138b3c4b4dcd6
 DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
+DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
 DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
-DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
-EBUILD calico-cni-plugin-2.0.0.ebuild 6265 BLAKE2B cfb936465edbbbdfaa0bae49aeb798be74f85c4e00a2ee0b1fa8ed9c92267c145a6f46994b7a327ba15429ec4f669d4368d0c85bb49301bfdba6224f0895b16b SHA512 8a765be10e90aa4208e7fce0eac68ea810224de95e8276a145b446f0adc60294d34d6939403971f432f3cc226fd070fc2042e1acff92dea0b79dd38d4d37fe46
 EBUILD calico-cni-plugin-2.0.1.ebuild 6365 BLAKE2B 26d3e32b88c6bc5236b42452eb80d034766188d5fe974be16f360209b7c02fded5ec2e0989aff8d8055a02eff236c7ef0fadadede52e684ca5d9807d3d1c55a7 SHA512 3edca428c969bc535592ce4cd6112945744e02b9e534490714112a9e08d276fd73ac8ab258242fd9c5db92c2b656f2abc44e7a91052edcfba1d1008519b93f46
 EBUILD calico-cni-plugin-3.1.0.ebuild 6365 BLAKE2B 03939f254629d3fdd82f2085665d1613ca650c0331654a7820f827e5d2045466a47169df41e7da6e2a29381d947f33d20ba5734b76bbbe6da5dec2b38c871608 SHA512 1c608f4b9e91bb64343c6c96300d760c8140fb3f6dd068d46f787b32e119eba97b209fe61aa28e88301a8211f47c762e11f38764ca36887f978ca162ca451965
+EBUILD calico-cni-plugin-3.1.3.ebuild 6365 BLAKE2B c562508cd4955695469bc41512377a8d1ed9105173929ea84d65e34ac0f30bd0bebabd8a08b30099a73bb24dd2b6e0d5f33521c58ded979a4bd8d5a3d5ef37d9 SHA512 fb7d14bf2625b002da53a52d475f5e32e9b005adbab272e8927ca4f7a6faed83187fafef70d42c63237669662b06a1146a81ac7e3f8679800aaafdd5f9692c9e
 MISC metadata.xml 344 BLAKE2B 69c43717917cd8c416f5b320124027b48453aaf2d74abd7b77d7b80a545c6b8504e3a4cafe80a0afbd545485a6c0d9af40394c40077708e117a6996cdb78f5fa SHA512 a43f50970c9415a6c39ee30e131ea5063a53a9b332265d63ec52992cee3022e2aae0eb4ea1893c283d7068dc0d9454d1952cc8287b3c4018306895c8ed39b9b9
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.0.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
index f1334bf2702f..5de889537c18 100644
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.0.ebuild
+++ b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild
@@ -6,11 +6,11 @@ EAPI=6
 EGO_VENDOR=(
 "cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
 "github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
 "github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
 "github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
-"github.com/coreos/etcd bb66589f8cf18960c7f3d56b1b83753caeed9c7a"
-"github.com/coreos/go-iptables 259c8e6a4275d497442c721fa52204d7a58bde8b"
+"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
+"github.com/coreos/go-iptables b5b1876b170881a8259f036445ee89c8669db386"
 "github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
 "github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
 "github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
@@ -35,42 +35,43 @@ EGO_VENDOR=(
 "github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
 "github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
 "github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
 "github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega c893efa28eb45626cdaa76c9f653b62488858837"
+"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
+"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240"
 "github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
 "github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
 "github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
 "github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
 "github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
 "github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go c63959043fbfe61db5795781c7a6c848cf2cbe0d"
+"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f"
 "github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
-"github.com/prometheus/common 2e54d0b93cba2fd133edc32211dcc32c06ef72ca"
+"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+"github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801"
 "github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
 "github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
 "github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
 "github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
 "github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
 "github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
 "github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
 "golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
 "golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
 "golang.org/x/sys 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
 "golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
+"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine"
+"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
 "gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
 "gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
 "gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 9b9dca205a15b6ce9ef10091f05d60a13fdcf418 github.com/kubernetes/api"
-"k8s.io/apimachinery 5134afd2c0c91158afac0d8a28bd2177185a3bcc github.com/kubernetes/apimachinery"
+"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api"
+"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery"
 "k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
+"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
 )
 
 inherit golang-vcs-snapshot
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 4c834c0a3e1b..12ce33132e73 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -2,4 +2,4 @@ DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e
 DIST cgminer-4.9.2.tar.bz2 1476371 BLAKE2B 01ff700cb5dc2fb12709da41aeaa22c6fc6b9dc6fb1e12116eef3a382ad328961b8d6ddd6ac6fce47ab8084c96e1a7be74a697b3d885c7e78dfadf07b678ad24 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4
 EBUILD cgminer-4.10.0.ebuild 2472 BLAKE2B a115a700eed1cf043865c4cc83ca0bfee50feaad74e90d42ac70d1decf8b40a4de6bf8d8834d75021754872e0d16be4547a7d1f326a04734b874b966389c3d83 SHA512 23f365350fa8fec10adb922674fc1f4f6aa41cfeb9687df55a05593d19fdfc256b75ec2a960b4d5a2fd691349a58a6af53d4cd00cfb9394f15c4d172d2897f3f
 EBUILD cgminer-4.9.2.ebuild 2394 BLAKE2B 6ce5b161deb01d273c92b90bbc3f33cff3eec09df2ecabd00ca34540f76b433150e9e8f99180d2063fbcd112929e95a15cac84daa7c4b887958e5b58663e41c4 SHA512 b696ca5383154324826cb2aec76b8ba8db973001cd9dafd1a782edeb02ff65425c10161f8ba70d3a9033b7ce2727dd3b39bb68601a1e82207a112bc5ae4693e2
-MISC metadata.xml 2382 BLAKE2B 88d66aca049d9e6800408ef8d6979cd7628c08cc183a8dee7ecc4060965c9daecb0ddd99a8d3b1f1d0ed3c0d40c8ef6cf9b8ed88828bc52dc61595e432a88079 SHA512 770e9bc5a34c7ee0efaf9ce697bfe84d3c5f46929c4ab394c049cd483bcc0d4057da8e0b068520de037074a5384ea06cecb688a92f8b6d3bd0a581553424fcd7
+MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 63f03907d2d1..14800d5d5ab6 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ki@baka.bakka.su</email>
-		<description>In baka-bakka overlay.</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="ants1">Enable support for Antminer S1 Bitmain</flag>
 		<flag name="ants2">Enable support for Antminer S2 Bitmain</flag>
@@ -44,3 +36,4 @@
 		<remote-id type="github">ckolivas/cgminer</remote-id>
 	</upstream>
 </pkgmetadata>
+
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index bd19f0db6691..a1b2a7933e6f 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,7 +1,3 @@
-DIST cni-plugins-0.6.0.tar.gz 787756 BLAKE2B b22825388b0d74f3ea26f79e9df9663a0cbb499447423d1bff93ffb422667f2895d17ae53c27089dab3f724a43489818787c2d51f85bd25f957ef1e6913b8775 SHA512 4b3c1901154eb1af86dc35888fda7b7666ee88d2cf728fb09182df5385d32b747de34c5c01598e1f37ae1e3497dbf5af2bc6ad6f737e683ccfccf9c1860cf6dc
-DIST cni-plugins-0.7.0.tar.gz 862293 BLAKE2B 27f0565c76a720408ea7c2f54f0651fcc661735e238075b6dee597e97a5d07bcc2c111dc24434d5b57193e0f039a2ddbb6246205da6a58fc24f0201d04d79703 SHA512 c5f13850ffd455b269520f9b54a916d09dd5823fc1bf0920695a556015f17e0e680ee377f3f8df686836855c331ec0f827c68718773e87337a8b5761a4c5ad69
 DIST cni-plugins-0.7.1.tar.gz 862546 BLAKE2B 9d13c616396017e3cb54dfdd5bde2c06d2ad572e55009b883d82757c173119694a40157f28fce5818bb8bd33325f2edb0ec197ff77aa2ab08615bfc55ce2bbe8 SHA512 23d3b35c22fdc85d087922fb59c63622a9283ff11d34d1a1043c323f9b07b3837418f333d2f2ab9c6a22514351d71aeeab6a57234b14f53ba29847cffa382ea0
-EBUILD cni-plugins-0.6.0.ebuild 1043 BLAKE2B 7fe1e5c6ed852fdeb73ab3c4cd18be764885f47e98c8c0df89fa3f3a2feaf9003f285142c18c2195af9213fa7af6cac9ea9abfb3414be26f5689de76e90719b5 SHA512 981589a5390a63178d7a5961794e28400c0f38e3c4419797779d6256cdd7efbfdf4d35857af740b76d5af0657995ebae08b465865ed6525bbd12658eacc625f0
-EBUILD cni-plugins-0.7.0.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 EBUILD cni-plugins-0.7.1.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.6.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.6.0.ebuild
deleted file mode 100644
index 7a785167042e..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.0.ebuild
deleted file mode 100644
index b07a467bf91d..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 81e457b4bff3..bb4858273654 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,13 +2,6 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-7.59.0-libressl-compatibility.patch 2838 BLAKE2B 95726ee47d375a98e85145fa52cd9d9d8d0048a3d83059c8c24e5275ef0f5e137ecfd5f3a5cc718f49b6ced84dc49f7c06c2da5584391bd8619194e5069d7736 SHA512 2a9fe255c0117421da3e7cc080f84e129460982deaea666e13007d775d682d8becc9c48e3f2ba26a15ffa2f5dd021e33437283aaad953c92d0d50f9cf668b636
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
-DIST curl-7.58.0.tar.bz2 2891868 BLAKE2B d13efab3e3e677804c0821257958eb6f4260234e3d939092e7de862a12ab84500aa50073e37610774b3be9e5a2910c3ba703a716296d31f799916c3046dc214b SHA512 853b945fbfe87e8dcf2186d8cc6609681b9ed3727f9f075bb434d5df07dcccc633fdf30795f6d5956e3355a5cf94a3780e4a3603b08cbd0368e44103de27085b
-DIST curl-7.59.0.tar.bz2 2904158 BLAKE2B c44d9985a19cb7b1e273f868181b0017c7b00683c195fd2c6696b9976e3c6a80d8b80490379c2dce653a9b2d698d1be33fce71a0e61844f38c12c44594909c35 SHA512 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb
 DIST curl-7.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13cf86ba201d69837f32c6b0011599a33507e65234cf3dccc5aa08ee558ff9c52998c50f0288738ba3992b6bc65 SHA512 c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9
-EBUILD curl-7.57.0-r1.ebuild 7103 BLAKE2B eb3b2a5181284c2e63d57d45e20692adf3e07d01e7f171379b8a1b96e8d030415aadca98a8ae475fc356b196987ae49a98baf70176169abf5c401aa3d940860a SHA512 a2aed3c0fd1c3c25eb1c2250d33ccbe8dd00c6e349cea3f1ccdcb054409872d78f8ffc5ce5b88e8da1b10a70ce6c44d08d56010083b0cdbb704e83ac00565a73
-EBUILD curl-7.57.0.ebuild 7050 BLAKE2B ac2b9ef326caec4e07e89ea30f07140856a4ae62177c1ef7fef78a5a968f8095dbbb82e455d0f309ac35dfbbf57720d013fcb411bbaa523964da124bf0e3f140 SHA512 3b496a5d3159150b6ab7b45fe5145b97a64a9f8909f05f09604634aaf5750ed560941c17be249d7cc5c27a0e03ab353fb913795d47f285ccda7c5e3ad48c786a
-EBUILD curl-7.58.0.ebuild 7093 BLAKE2B 98eaa108a6d55f5a969fe0898e31f0a2af4b7fcb15ca993eb3d238d0a73c6a60d010ada1b1c5d6cd21b117832f8bab1e43fd9e3ff2072457144e4f5df254fc3d SHA512 a31269371ccf0948b1413cd256d6ad4df609b89c40c44a54cc1b83282353b45ea314322fc12fba279c27bfc7513a8c5ced8c09df065230ff833c7b13eebc87a5
-EBUILD curl-7.59.0.ebuild 7267 BLAKE2B 4fadca87badfa6435f391f19508a8a8818b47bf755746f9cb9597858923ea2205daa9661cf1af5cfc65e479205c03662524e18e0ef9d1dd2d2187226f5f93117 SHA512 eaf229ab649e47e2743f1d1217309df883d3513e4f3f0b7be9d1e1a5fbc04f9b0491b6be0a43c6202b0cb17dd03a3381185f5d8f9c256576173cf282dd91c411
 EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.57.0-r1.ebuild b/net-misc/curl/curl-7.57.0-r1.ebuild
deleted file mode 100644
index 9abd5e011fcf..000000000000
--- a/net-misc/curl/curl-7.57.0-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:= )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.57.0.ebuild b/net-misc/curl/curl-7.57.0.ebuild
deleted file mode 100644
index 8dfb1f27f4cd..000000000000
--- a/net-misc/curl/curl-7.57.0.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		--without-brotli \
-		--without-spnego \
-		--without-winidn \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.58.0.ebuild b/net-misc/curl/curl-7.58.0.ebuild
deleted file mode 100644
index 421abad2466e..000000000000
--- a/net-misc/curl/curl-7.58.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:= )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.59.0.ebuild b/net-misc/curl/curl-7.59.0.ebuild
deleted file mode 100644
index ff9a19fed9eb..000000000000
--- a/net-misc/curl/curl-7.59.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:= )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-	# the next curl release (7.60.0) *should* contain this patch as it is in Git head and 7.60.0 has been tagged
-	eapply "${FILESDIR}"/${PN}-7.59.0-libressl-compatibility.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 9c19ff8eff7f..33fcce71feb3 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -1,9 +1,11 @@
 AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a
 AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d
+AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-2.10.0.tar.gz 655475 BLAKE2B da24593def6f1f08bc9a2cc98fcb06dafaf419410bac2f93b00d2085fb7ed2ad3b72ba7731ec368b54aad318057a2a1998bca5e56907729c9261c3c4bd0705fa SHA512 cf84d1117ac6b4dbd87db4a6ec072e945e64677fbd5dca169e06d954c599ce4ff9a80254aa3027bcc02f7770a5e0a3bcaca075aacfd28c62870d011801d0d225
 DIST dahdi-tools-2.10.1.tar.gz 656275 BLAKE2B ee6d4679b22eefbd1bb0f6fb9375f5f0a42ba95418828c2e318469edf06bd9b6b59e826c821a10cda8a93861219fc8d15413280b05a2aa722e65e0c18e2abd70 SHA512 856116119336b1d51da1c263c95e361c379d61b672db69703f48fb260d570f9335169b8c53daf7d6b18725eb3112539fd9e229b257ff6e9d76a00e74a859da66
 DIST dahdi-tools-2.10.2.tar.gz 656284 BLAKE2B 0636d88c1d65f09b569549cd2b03d4e2479de45faec8f55b49730ddb7b91a6e0f9a22d22fb37fddd70ce6451be78d42b6abf744d443356e8548312dd9af840cf SHA512 5030e5b5fee3ca7853da07a907a4a9e4e72b06d62cb315cf80c0978eac27d70d86024c32f0fc08e8f667f5d7c039968c862631cc310ce30008d52cd121c61004
+DIST dahdi-tools-2.11.1.tar.gz 1500037 BLAKE2B 84583633cf1e125e7e4203c9f3443765f15eec71ab669e0ec09921e8207fdd24320b6b0920f8af3b2c45bd1080abfe85569285757f1a8450f4e65ad8c9093549 SHA512 d13f799baeaecab4601a379fb703fc169906e873f71baa9d13d688b2a3f4490a1c59eea8bd50e1a08a0712b38e556f8a17d02a8ea5289a003ca91b570ae5b8a6
 DIST dahdi-tools-2.6.2.tar.gz 843572 BLAKE2B 5bdf3d8ad5a853b29bc93dbb33ab4015beee2f362aa8e2fcafabb4ae5cd4511479a392e8505d1da6448590538c5e3f9b213d3c6a8774446e314ee26077f56065 SHA512 3e0abb7cdfff072720bf48ccdb5cc43d183e0c3217b1eadfee7920f5b29cfe31f3b79d981516ae95232065c7686a87f169835802788cb1185c3c947feff275c3
 DIST dahdi-tools-2.8.0.tar.gz 642755 BLAKE2B e235fdb17084df4fff6c4e18f0555cc5e6926d7adf7a443a018c6a267d6a4f2480d57c133be6ab682f64e7a798513ad5d35ac167574d666b44965208f4af4a85 SHA512 983e1dfe9bda130c3d0e60f44a79ebb75ae8ab9f27bd77d0355c58e901012465a37411fb1cdc97a131ac01ac892f37729f5853439aaba4ba5a4927c7a7997f81
 DIST dahdi-tools-2.9.0.1.tar.gz 649990 BLAKE2B 46e8f77d57e1b0b5083994dc1eaba28009c69c9a8442e9c2f981c20d251f4126ea34713df0be12b2e57055637e0780b9a8166be9e4df574c462bf7dbd9c688a0 SHA512 2e16312d4f44aa50cbd7d843514aca06b8f1019b114a00ca5a76cf40ea9b8e937766e70c7628a76a991fa3ad8a12d36782c378a2ad783f9882f0225429794494
@@ -12,6 +14,7 @@ DIST gentoo-dahdi-tools-patchset-0.4.tar.bz2 2665 BLAKE2B 79698214b5f61112e678dd
 EBUILD dahdi-tools-2.10.0.ebuild 1143 BLAKE2B c92636b1cad936fb9b9f97a8d21928186efa4e951c2f8e99c61e5514034e3da2b9b2c44f5094f159bddedced779bfe476c9d4032c1f4d8b1f205f31d63246cb5 SHA512 a676b96671665a7e02bf92e89c301da1c870a19bfc2659dbeeeb756603d7919e497740e895dd12b308f477c8c5cec1f834ab937160c9d37849777bfbc665b8ba
 EBUILD dahdi-tools-2.10.1.ebuild 1241 BLAKE2B f6fb7788463ebb3194408c47da7aa6f77cad25b2bc2dbd4af333ccf0aeff7a982c7626abda4814ee2afff801ec8330b7a551071b93ae71fe68fd67dc7c72da85 SHA512 10ee288134f70d7dd6d1ca4a96dde8e292120832e4f77ce9523ef0efac9df2dfa19b7fe8e45949b6dcf4aedcda4f5790c717d128cc367c8e165a8f6ef33a6660
 EBUILD dahdi-tools-2.10.2.ebuild 1255 BLAKE2B 338e74e563252a4c92eb07c751164639520ba22f2775e588e0bc483c5d011ae7d2f7c72bf2ca60675450ddb6c1c2e113128c10cdd5f2adc951e6d92cbb41ab3d SHA512 220622c8f5cf526481d605b9176f36145a9e4dce3df365a869714a674834d309cba09d3350ef0f17cc3cddd714a613999d50922e8c1a66d13fcd1c1f73aa7f89
+EBUILD dahdi-tools-2.11.1.ebuild 1514 BLAKE2B db13d058b35176e206d3c01045af6487b521aba5f6b83090c32dddf77e5954a62c1f301c25ccff808dfbe4ff7dda8f5a84478eccbe0f554e3aaf3729be35e2c1 SHA512 13aea48067b15d330320fabd4c92de9d8c9d4b5d5ae5eb8b9bc2cdd8599f4e40f4f40cb97234b7ee21d9b7b5112b286c97af33aeccb7f00acd291532a1d84701
 EBUILD dahdi-tools-2.6.2.ebuild 1142 BLAKE2B e56f23fd0ad6e2a3d5739492826f257987788bdaeef5e5123ddf2ff05a15656fb39200089c0b6c292d03b0dfd03150501e1c76fce6c1bdc37061c9fb87d8e7fc SHA512 0a40014c9fc78a7242c871d4aeaa01e401ef5d1d97b16597c655cdcf97bc0315932b633cf13e6f3ccddfcea4f60d0e0a71d294e57e6be84eeeedacb61ee06307
 EBUILD dahdi-tools-2.8.0.ebuild 1142 BLAKE2B 4bf03468a83e536ad1e378412ce9dde3292db6dd4910ef84ce0a80e14c95c83f8e0b3f87c7e2b52d722ad3a868e71c5dad6d1e2f09d62587381f8cfb4d14dae5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb
 EBUILD dahdi-tools-2.9.0.1.ebuild 1142 BLAKE2B 4bf03468a83e536ad1e378412ce9dde3292db6dd4910ef84ce0a80e14c95c83f8e0b3f87c7e2b52d722ad3a868e71c5dad6d1e2f09d62587381f8cfb4d14dae5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.11.1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.11.1.ebuild
new file mode 100644
index 000000000000..503d311eb7fa
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.11.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ppp"
+PATCHES=( "${FILESDIR}/dahdi-nondigium-blacklist.patch" )
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with ppp)
+}
+
+src_install() {
+	local bashcompdir="$(get_bashcompdir)"
+	local bashcmd bashcmdtarget
+
+	emake DESTDIR="${D}" bashcompdir="${bashcompdir}" udevrulesdir=/lib/udev/rules.d install
+	emake DESTDIR="${D}" install-config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+
+	# Fix up bash completion ... to Gentoo standards...
+	for bashcmd in $(sed -nre 's/^complete -F .* //p' "${D}${bashcompdir}/dahdi"); do
+		if [ -z "${bashcmdtarget}" ]; then
+			mv "${D}${bashcompdir}/dahdi" "${D}${bashcompdir}/${bashcmd}"
+			bashcmdtarget="${bashcmd}"
+		else
+			dosym "${bashcmdtarget}" "${bashcompdir}/${bashcmd}"
+		fi
+	done
+}
diff --git a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch
new file mode 100644
index 000000000000..3df8f166a56c
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch
@@ -0,0 +1,12 @@
+diff -uNr dahdi-tools-2.8.0.ORIG/blacklist.sample dahdi-tools-2.8.0/blacklist.sample
+--- dahdi-tools-2.8.0/blacklist.sample.ORIG	2009-04-02 10:34:32.000000000 +0200
++++ dahdi-tools-2.8.0/blacklist.sample	2010-05-24 20:46:05.000000000 +0200
+@@ -14,6 +14,8 @@
+ blacklist wcb4xxp
+ blacklist wcaxx
+ blacklist wcte43x
++blacklist wcopenpci
++blacklist zaphfc
+ 
+ # Some mISDN drivers may try to attach to cards supported by DAHDI. If you
+ # have a card which is *not* supported by DAHDI but supported by one of the
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 5b3f150511f7..f80901b9fd52 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -17,6 +17,6 @@ EBUILD dhcpcd-7.0.2.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f
 EBUILD dhcpcd-7.0.3.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 EBUILD dhcpcd-7.0.4.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 EBUILD dhcpcd-7.0.5.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
-EBUILD dhcpcd-7.0.5b.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+EBUILD dhcpcd-7.0.5b.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 EBUILD dhcpcd-9999.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 5e7bb9ec02d9..271093518328 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -5,6 +5,6 @@ DIST dropbox-lnx.x86-45.3.88.tar.gz 108891513 BLAKE2B f72ea5663a2ea46b0c34294eb1
 DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
 DIST dropbox-lnx.x86_64-45.3.88.tar.gz 114967662 BLAKE2B 3276b3b20bc96eff3a756064c64b5a0e8ad28b27d29579dd6dc34043427bb209bc5d86be62651f6642f61af17388113ec9a1a4a211e3149ecb8679a4b8e505ca SHA512 d3a787487084237fff928afd6ec2192f27e196c589bba3c6bd8a501055d1a3d4c8dcb88b15336ea03bed38e2a02d0731bb9725cbb324bb6e00ec95e98ed671ea
 DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
-EBUILD dropbox-45.3.88.ebuild 3079 BLAKE2B 4cea1be2d51e713e471fe54411a54c6652c302085798fa67d696c72dab246615b7fc767eb278c08b6ff3feab02eac7945a9b4259bf90b1c2bef85e82993dd386 SHA512 e3e1b8989ccf71656e3fd2d77b747db3e66207dc80cae00ac9ac441768e1eebe87f44060874cdc349dcb07357d05ae3b5ea1998d5671a047d0fdef543e8f5fcf
-EBUILD dropbox-48.3.56.ebuild 3081 BLAKE2B c9cc9629a3f9f37df18119d626534d8f91652d5fc24cf401cc6aaa847061e6ab251442f6b70e63143871b687342c6b63666a47153bf1386bafd3cfc12ec21520 SHA512 aaeb99168a5b3a20a193bee845c6aae1de5752b7b402e1c9d82a724b93132289d7a449d36c71fd7d78cc6ccf616824d0616a417a5164f56712d89a6caf6ced14
+EBUILD dropbox-45.3.88.ebuild 3084 BLAKE2B fc1bc1fe1af2b398ac5dc968e3d6d490885efebddb5c122abc95aaf43bfe6aa5645f45b8e633b83ca11197aec2b4aa465edd4edc0ae8aaa50a08dbff881147e8 SHA512 3ff3239346087b27268891cc4aa315dc57520e5c988780155d68c6554bc5a62a708f782ddfbb793fdcb451d8264b9de38fd8ef97899596dacccc254e629378b3
+EBUILD dropbox-48.3.56.ebuild 3086 BLAKE2B 0862a2529d92b088493d6382fbc30c67172c8902897fcf3265983428013eaeae268e146d023eba23486ab78de418920b9fe5c126491e58957195faac8a5c5070 SHA512 8ae9a3b7e9634cacf5721f736cb5db39213b19a8007eb19ae27ec9d292a81d3fb0ee82eb51134975c52dce4512fafa82c20b8b6ed21b0e155307a5681b130eaa
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-45.3.88.ebuild b/net-misc/dropbox/dropbox-45.3.88.ebuild
index 1bb000a90cb6..5a3d903cc0f5 100644
--- a/net-misc/dropbox/dropbox-45.3.88.ebuild
+++ b/net-misc/dropbox/dropbox-45.3.88.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 inherit eutils gnome2-utils pax-utils systemd python-single-r1
 
 DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
+HOMEPAGE="https://www.dropbox.com/"
 SRC_URI="
 	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
 	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
index fd6a76df5146..a69c77c3b6c2 100644
--- a/net-misc/dropbox/dropbox-48.3.56.ebuild
+++ b/net-misc/dropbox/dropbox-48.3.56.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 inherit eutils gnome2-utils pax-utils systemd python-single-r1
 
 DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
+HOMEPAGE="https://www.dropbox.com/"
 SRC_URI="
 	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
 	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 458e8ed29a5c..e6cc592bcf2e 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -5,7 +5,9 @@ AUX gsutil-4.30-use-friendy-version-checks.patch 759 BLAKE2B 10f482f828c53f4f569
 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
 DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
 DIST gsutil_4.30.tar.gz 3549515 BLAKE2B e6ef7e3832922d0ac1dafee27d56ce810fb6daab0ffb19e3c5644c9f6b71c3a68490c809fce101c723a15a2124013691321c1cf5a6e5be0970bb8f9cb8878ead SHA512 504f21e3a79695959b128aac9c1b53fda8a5752c813b81edeff3d435c95e5cf269c75e682467a615e093a00ae2b52a6c9c7f0fc2a2fd49440f633124d47f197c
+DIST gsutil_4.32.tar.gz 3644450 BLAKE2B 0e8667504d2bcb499723cf55e6bf825cf555609209c73efaf544183d01a2a5e696ee7c4968f87ded36158a517abf397a295a770d8b9e230695720e90ce52f2d9 SHA512 9000d67cc29af6e28b6210edee3e2143bd382ff7fbea76bd75dabfd0caaafe82832c86e4148005edd1d9f986127f573d16b8a3387747bc28a6091ff189829e8a
 EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684a88acb1cd258e1fbe004f9bfb9315d158049c7fd97cf20bf128a0a055fc20a7c57e16a0cdb966ed7687673c SHA512 afc5055223dfd3c2ef7bdd1c4681ebec2f81cfbcae9e6c06a4ca8abe887c020050ef261e2e047160bdb0f3f49da57ae67e9e6dc75928a886eb25cc696e5488bf
 EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad
 EBUILD gsutil-4.30.ebuild 1789 BLAKE2B 088ae1fa8dccdc6144597d7101517373075b853fce3068d4493af5a840088886f10324f1864e2bc7173b1dbc8cab4324b0c18f3692a14f791b16ccf440480bd8 SHA512 382ac24aa1093c90c64ad3c4d1e059bfe83f37c098810ee93a46325025dae125a3b80a552659b766642fc748a8792944e394dfe8921a73855f201a9727ad85e2
+EBUILD gsutil-4.32.ebuild 2547 BLAKE2B 3a5caf6b54cb38b7d615b20bf1909a289b13c4ec3e632565da07e830a5956e57c8495eed4d55781b4643e2ae199464670fee1efb82513d3dafe93d2a54c2ee14 SHA512 47f01bfce6091f5f7911663fd71fb7cef7e6f0cd5434607cd669c0d7b757003c6f7b1f3dc68b88ff18f00334e14a1b4c18e52136f554260b7f2a62347bc9b3bf
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/gsutil-4.32.ebuild b/net-misc/gsutil/gsutil-4.32.ebuild
new file mode 100644
index 000000000000..c22ead4ade73
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.32.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.1[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
+	dev-python/google-reauth-python[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e 's/boto==/boto>=/' \
+		-e 's/mock==/mock>=/' \
+		-e 's/oauth2client==/oauth2client>=/' \
+		-e 's/SocksiPy-branch==/PySocks>=/' \
+		-i setup.py || die
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady
+	sed -e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		-i gslib/tests/test_cp.py || die
+
+	sed -e 's/\(executable_prefix =\).*/\1 [sys.executable]/' \
+		-i gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -e 's/sys.stderr.close()/#&/' \
+		-i gslib/tests/testcase/unit_testcase.py
+
+	# Package installs 'test' package which is forbidden and likely a bug in the build system
+	rm -rf "${S}/test" || die
+	sed -i -e '/recursive-include test/d' MANIFEST.in || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index f941ffc21e82..087e848313e0 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,6 +4,6 @@ DIST linuxx64-13.8.0.10299729.tar.gz 19855914 BLAKE2B 62029b75a2c77f3c58ca272a3c
 DIST linuxx64-13.9.1.6.tar.gz 20047795 BLAKE2B e23473d4f9486393b381cf7b6f0c91f63ac053c9b008d1351e9ecc65ad827a436b8de4758a1fca019731315deb4d0bd919af46839a771d270192c00699eab839 SHA512 b55fc4a89b3d482381abd48806534f55813746c17e1c457fb2c23f6c81dfbd019cf86355680921b9e3c3f4c01176855fce63ac7258ca726fc622bf1bb4e45ab6
 DIST linuxx86-13.8.0.10299729.tar.gz 21763683 BLAKE2B fb8238dd256bbeff59df73e1ee495579ffa315d5d38d857436ebdafc2d5e4f9e3bf3c760a66005fbd82657ddbe418849a28532b15b757937d0892e4be33a1905 SHA512 7e6c70e3600cc56c85722f37e473cf3c422daded0f7e755c47bf8b17f224be0676f5ef09c594c058eae6760dc4633c13a02f4d75c3870a4a10a04d29159a670a
 DIST linuxx86-13.9.1.6.tar.gz 21969792 BLAKE2B aa683e63e6216ae03d86464cd24e0a65972f251880e8211bc0ed163353690570ec4840e949447d13008e0ce9bed35b097e97dc0c0981c710e74a6263b045f867 SHA512 9f9c0ffb25b4f476000199fb61668c577a098dc445366445cc5ed53bf433cb4699e66bab952bad9c3692e395247819c5b86ef7c2e35b974a1c7a9d4e2b83959f
-EBUILD icaclient-13.8.0.10299729-r1.ebuild 4375 BLAKE2B 002f82e49975a5c62ba2bd3e6c265fd3bc7347923d5ce7c2c9067fdada55d113056c21e3c04620471ce98fc2105fa8403cccc1db2ffa2fb7fd7a342a30c60344 SHA512 89e0df87d572a0603bca9f9fc6d99e2701e0083f4b903d5e2da172ecf11e69001a74e61252651cbfb481ada67e77b4024c1ff62b3be07b9d9d07e0492d9d52a8
-EBUILD icaclient-13.9.1.6.ebuild 4586 BLAKE2B 1559ad8652c1784b80dbd61a5c386866d8acc635ea473b0b1692d9902a76952bc135e997f85f31a7cafd9c18c1d499fc82599cf64504abc5d78ba9053df7820a SHA512 682d88534b44a871bc69dafe5795f0c051f7d924ec5d6541197aa960d637fa2e281a1685618c7709dda4891a5ce6e5fde7e1214f39fb52c5daa18fd00fa87264
+EBUILD icaclient-13.8.0.10299729-r1.ebuild 4376 BLAKE2B 807575248d0645432a935e6cfd358b5393430ed3db624400ed857f228c8bc7ac742b3eab15ea64f9bc45e335d910607c76015f146da466020cb8ec1826166889 SHA512 051a99ff9ebdbb3535077bf092571a6b40451bb6835090daf1fc53f6a03ea94255374ec52b28c283318682faacbcaf78fd32e63f5975991b29bb349052616bd0
+EBUILD icaclient-13.9.1.6.ebuild 4587 BLAKE2B 6dca10da4976be6e7c7651fb12b2740fe2829e73225ffeaf0ba782c81743859808f0560c8063268074d8632a13fdad4a39d557ce2f29275b8fd92de398831c6a SHA512 7ccb84700329ff24290c6271659dbbad2059de90910fb1401d4230962a1eee85f690400fb0f2e1c5c021c646dafe2cee9921328404668b98371b06cc0ea71a5a
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
index 2099a68e4200..6f5258ae80f7 100644
--- a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
+++ b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib eutils versionator
 
 DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="http://www.citrix.com/"
+HOMEPAGE="https://www.citrix.com/"
 SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 	x86? ( linuxx86-${PV}.tar.gz )"
 
diff --git a/net-misc/icaclient/icaclient-13.9.1.6.ebuild b/net-misc/icaclient/icaclient-13.9.1.6.ebuild
index 6fc5413c637f..43759820b120 100644
--- a/net-misc/icaclient/icaclient-13.9.1.6.ebuild
+++ b/net-misc/icaclient/icaclient-13.9.1.6.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit desktop eutils multilib versionator xdg-utils
 
 DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="http://www.citrix.com/"
+HOMEPAGE="https://www.citrix.com/"
 SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 	x86? ( linuxx86-${PV}.tar.gz )"
 
diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
index e71eee3b3202..1466760af78e 100644
--- a/net-misc/networkmanager-fortisslvpn/Manifest
+++ b/net-misc/networkmanager-fortisslvpn/Manifest
@@ -3,5 +3,5 @@ AUX networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff 747 BLAKE2B c1
 DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 BLAKE2B 1e3aeab2df0b91b09fba1678861215f164251dc1f51c12c0cdbb4c53c939849d75c5f70552e608a11a0c9c7890a15d5dd4b218c7c440c92bfa8df157ff20babf SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d
 DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
 EBUILD networkmanager-fortisslvpn-1.2.6.ebuild 1062 BLAKE2B 0dd5ce66bb75b9bc0924b3c61574fe74f28456c1f4b400fb99cc67f95352c5531c6fb3ce9119353b6d7140a5e1a352e33fb0bf3d15b6d61d3b4cba888c5a6c85 SHA512 90842eecb134600932468239e539350849c5c024021fc10b77a06f557fb71e6eecad349403d4b64185e7045d3f1944027641ab3a882984e1e3f07463e1fe8360
-EBUILD networkmanager-fortisslvpn-1.2.8.ebuild 844 BLAKE2B 649a06b13be09e83275f5d8aa08482253c33f1264936194115bf0afc9eaf30e6838de233507e834dbb33cbdecbaccf07f5e3d2ddbb783535289c21d96bdfb2db SHA512 eff8d97e20af7e5bee68dd1b5322d9e16afd7fdc12d78cbb9b285b9758010c1fcd9c0aebdd1fe5e3b3b5adb7e250106fed60517e889a804eaeadfd5321535dd4
+EBUILD networkmanager-fortisslvpn-1.2.8.ebuild 868 BLAKE2B 66af3c3ee466686e9a24a321b64d0deb2ef5cee26429f3925ef4f9fe8fdb50ae5fccd8d8acaef03e92bfc82dc4dc0d5cd79078304ecda137cfd8af50605940bf SHA512 26677c7e7bd9d2fea1218218971fd7fb2043d10d2804811c5f3cea69df0ad4617cc46a77da55028d9539f843bcb493c8669370a9a4f5c80ea65850bf892bc6aa
 MISC metadata.xml 380 BLAKE2B 68402a902953176bf28ebc6521a06c109cbf2a448c184665cef3ab42ec6b1f7f426a31b7714275e215ae742ff79b2fc7b5c4d80046f8a15b5a73fa5d6a05ebf1 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
index 83207b80082a..0aadb4db8bb0 100644
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
diff --git a/net-misc/omnisync/Manifest b/net-misc/omnisync/Manifest
index c438f0280297..de9bef48e172 100644
--- a/net-misc/omnisync/Manifest
+++ b/net-misc/omnisync/Manifest
@@ -1,9 +1,12 @@
 AUX omnisync-1.0-help.patch 806 BLAKE2B 8c82444278b5da9411b8babee5e6690825b800ee279873d3e9bb936f0c0c35d5f701de8b05c4cf6af02af1c961c9d902c80e155e15bb5f9683921188c3515a94 SHA512 f131ef883a9646a093dde18ea2c78cd54d0ba9d9541ed600a03521e595f9100e7df4145488ee3b52e61449b98f3e7bd65251ead8f369595e36f174373c51b690
 AUX omnisync-1.0-maxshm.patch 652 BLAKE2B aeafe8b36d6bf49e426ee1f78514a5f9cafb12f3ef2787d030b076178484a7b96e22f939ce285e0d6ab4c39c50ae12baeca841a5a88f4989e2c5348d52ebff3f SHA512 883c8509357ba00c97e09f4bf96b402999ee1100796c147441f72811f0b475a8d37f05fba7a33d341be759c42c52eee79338da4dfbd65fd0ae246bca13ca4c4b
+AUX omnisync-1.0-openssl11.patch 508 BLAKE2B 36a55e0442b06505331f97fa058f96da36fdaafa6dd8d22b8bacc30d91637d31b17623c5979dee59e9348a611dc0ba3ed3e6658b288c3a91cccb76737b3b7880 SHA512 3c81e044ab0184473a6184706020aa50f899388e5d3ffd52d6777607b1900d1dd362d57c2bf89f7f225a776fbdbdf7683e2183a6bd6a2c54536ba8b6f2f6df29
 AUX omnisync-1.0-statfile.patch 434 BLAKE2B f003723bd48fff0b7c54b3f187744ee90fe1266b7dca85c445004f85e60af86f12427bd81323b0db12ee03f4c417b833cbb3bc7a65d58b89ca21d76ccb1d86a4 SHA512 2e613f85820f1c17c9c6afbb30d2f0607b69d90d2c496dd281b457d5f5658270513b40a72f14b165a2cb29df69c296007ec8039424e5dad227d0aa41b55c189f
 AUX omnisync.confd 970 BLAKE2B a3d678032e7520d359fe078cf4599e98d75a5f3444bb5e1b08ce3cab246424f6d22c153dee45c66417682212adbe0b3c3c9730b41ca36dde5449ce48e8b1a202 SHA512 f3bd6b0eb866eb6650615fd4a838f07afcbb8b9322b12658a855fcca2ec72171b035aeec5a5bd38bb4f4ad14c32647ad14d994df7058d99dbb9d333a309ccfdb
 AUX omnisync.initd 618 BLAKE2B b532cb4f9c0b763ad97d1098e34e8d4a0b14195698f0f6f518de4e25744058cbe5c66ec53a00eb7bffa9191741d78a75ee3029683e13092a3f227d4955cbecec SHA512 f1c116743fde8578a9812553640da3f680911469d8e38b0af007d69aab99038bed651436f7d9dd5ed8dc939fdd3b94a75c93d15b4bda866460b63c7253788941
 DIST omnisync-1.0.tgz 27725 BLAKE2B 00e546e3a04c8483f4a3995207fe6715e25526ca639f517220725c31d50d1c01fe0d15927e11e84143f3b2c8aa80ede1317c818945f0249147548bb03d27f744 SHA512 742ffc0a85bd923b99ae7e4f50a6aaa29107eaa987039e902797c78a9673e914e1fa61b2484c6777f62b0caf8b3110a071fd103c8b18456083883df534a1ef4d
-EBUILD omnisync-1.0-r1.ebuild 1193 BLAKE2B b894dab0a684559a1aae511c5e7df44f18357d6ffff6eb7c7c310f861c88a69d081d2f2625e2b57d14f5c24c6d6be2c4605fa9811472d97e52be3fecc694c81a SHA512 f708dedd72699462b0ed1fcd9e51b4382b112563462457147378d51bfc9e279f4955e45fabc7363316ae79e0eb624f9ad15f63b75f4feb1c3fb943b4d3ab88e0
+DIST omnisync-1.0_p20180614.tar.bz2 26335 BLAKE2B fbb6e4d39f16e307b5355c1e25c656bfdd3b280888468e64bed692c52af28b35d813e3e5a19c6dd4c13bfa8c64b62f01826bdb8a4a40f358cc665e5050ccfbf1 SHA512 fd21907574abe9801999efa8dae6e19e80198536cd79a1261cd2c006b7beaa3637f5b9da578659baa9e14eca1756fa41551458f14bad44f9636d76634031f262
+EBUILD omnisync-1.0-r1.ebuild 1237 BLAKE2B bce909126ed1750bf4b74b0b0a544bd7ea656b4e3513ddd8ddd9c663749a02cfddf2b47849958c61f81b76569ee5905fc31f9e6ab2693fdabbc73b91ddbe939c SHA512 e4a7a67856aec95b93e3abe1ee8c30cda147ed0d165a2e8217cc2fc34dd1301a75c1c809acc072c5d0406a6bb069a3dea288e678d5ca66e46a42a5c459237c81
 EBUILD omnisync-1.0.ebuild 1046 BLAKE2B 7f9b71a811ee74684d4fd814e457a38e987fa83ba877632c0bc7e1a3620705cbac1c1373b8d28f27440197854d4631661c97b0ca605a1b90cb9fb3a3ce97d047 SHA512 bbd43bb6e8882385fd203e5bfe62acbd5f104e5eaafbd177bf9a008d37b4cefb6d22624b269385635a3a61dd11cb672a7043ffd576bd63e0211c3afb135e3110
+EBUILD omnisync-1.0_p20180614.ebuild 977 BLAKE2B 351af6508315ee71b27ef79ec655dc63557f1418bca9f9ebe4cdcb1b5e3144399bdb4933d304cb62a6317986b63c347c47749e4528f6c8bb345ef8b5e52ac018 SHA512 38d20c3820aa809fbafed53c42450b45d7d17a16e3374b2832c44130d2e5efde6622105afb24fcb4412de025a574f08dba892044de163502bafc32eb7f7f665f
 MISC metadata.xml 242 BLAKE2B 8f242b6b14b8f22e005169c7c07b6d685e7c1ad269b4de100c7bca4e148a1f25dda103b7e213309b5509d51d14170498206d9bdb7d766bf986a00eaec55b9480 SHA512 c4931bb9ba45348c61011844649be8a5879b84e48316804989379694c692d96d29794eb38c642d0036ed9e61c4864c605340d6cfa6753519b66b05f26545f0a4
diff --git a/net-misc/omnisync/files/omnisync-1.0-openssl11.patch b/net-misc/omnisync/files/omnisync-1.0-openssl11.patch
new file mode 100644
index 000000000000..8c0d9c243338
--- /dev/null
+++ b/net-misc/omnisync/files/omnisync-1.0-openssl11.patch
@@ -0,0 +1,24 @@
+diff -aurN a/mssl.c b/mssl.c
+--- a/mssl.c	2009-01-02 04:03:20.000000000 -0500
++++ b/mssl.c	2018-06-01 20:59:26.447052020 -0400
+@@ -136,14 +136,20 @@
+ 	if (!bio_err)
+ 	{
+ 		SSL_library_init();
++#if OPENSSL_API_COMPAT < 0x10100000L
+ 		SSL_load_error_strings();
++#endif
+ 
+ 		/* error write context */
+ 		bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+ 	}
+ 
+ 	/* create context */
++#if OPENSSL_API_COMPAT < 0x10100000L
+ 	meth = SSLv23_method();
++#else
++	meth = TLS_method();
++#endif
+ 
+ 	return SSL_CTX_new(meth);
+ }
diff --git a/net-misc/omnisync/omnisync-1.0-r1.ebuild b/net-misc/omnisync/omnisync-1.0-r1.ebuild
index 5875550ac80f..d82752e6f702 100644
--- a/net-misc/omnisync/omnisync-1.0-r1.ebuild
+++ b/net-misc/omnisync/omnisync-1.0-r1.ebuild
@@ -21,6 +21,7 @@ PATCHES=(
 	"${FILESDIR}"/omnisync-1.0-help.patch
 	"${FILESDIR}"/omnisync-1.0-maxshm.patch
 	"${FILESDIR}"/omnisync-1.0-statfile.patch
+	"${FILESDIR}"/omnisync-1.0-openssl11.patch
 )
 
 src_prepare() {
diff --git a/net-misc/omnisync/omnisync-1.0_p20180614.ebuild b/net-misc/omnisync/omnisync-1.0_p20180614.ebuild
new file mode 100644
index 000000000000..c074a15980df
--- /dev/null
+++ b/net-misc/omnisync/omnisync-1.0_p20180614.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+SNAPSHOT="b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5"
+
+DESCRIPTION="A driver for NTPd for people who are firewall-challenged"
+HOMEPAGE="https://www.vanheusden.com/time/omnisync"
+LICENSE="GPL-2"
+SRC_URI="https://gitlab.com/grknight/omnisync/-/archive/${SNAPSHOT}/omnisync-${SNAPSHOT}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-libs/gnutls:= net-analyzer/net-snmp:="
+DEPEND="${RDEPEND}"
+DOCS=( readme.txt Changes )
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR%/}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR%/}/${PN}.confd" ${PN}
+	einstalldocs
+}
+
+pkg_postinst() {
+	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}")
+	if [[ -n "${isConfigured}" ]] ; then
+		elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service"
+	fi
+}
diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest
index 618bc4d83816..da171c3f2a28 100644
--- a/net-misc/openr2/Manifest
+++ b/net-misc/openr2/Manifest
@@ -1,4 +1,4 @@
 AUX openr2-1.3.0-fix-build-system.patch 855 BLAKE2B 0712ab876e8941f63756531597a861e433e2e3a8f457fcf62c83e3d5f32d1f0f809c2fb34ce362533d7a4e1d434132c0df81ddb656e3223f7dab1381001215b4 SHA512 6f71b83d1ec8a07a32a019784954148adde44b2fdfc982ec9d02deeae66fc307448f6577d715276de4cdde42f771d647d625d3111a6189cf60ae8f6c5c6c2d2e
 DIST openr2-1.3.0.tar.gz 650048 BLAKE2B bff444c839d5f62fc889c1720cb9c17c38c5bd4b0dc3b3884c8fd00226aa6354281cf37c7a748fca4e16e633a94ac055c8f7b5e4bf69d97732846fdbc618ca47 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e
-EBUILD openr2-1.3.0.ebuild 642 BLAKE2B d9b0c9535138d24f4d5ee61300489d61d6208c47c8830de35fb656455fccf88d68cb0c107fea3ba8d0d8c928086b419fc0745fefaa972c8105db1ad1a02f9dd5 SHA512 bf60eb9b6729382d7e7d9b64511ae0af3cd274ba9d90c7eaec5726a6d3954bc3c4f4034d0ec4f42dc448cdb7206421be728477da08b7a19f604c50a6e3e215df
+EBUILD openr2-1.3.0.ebuild 643 BLAKE2B 4d0a464275893bc1dbfef82c36637c6f08c15520a1aececf0948163201cf808d2fe32a17e0c26c7bb6f7e8a3aa747aad82a4c30672bb1440527f1d8f3013c2b8 SHA512 accff8b8e325bb58c3c2da3f16ef0249fd970382b4839a530f1f6913ace63116b8f796327f8b6a85a33227baf10cae37548338a24e708c75a0d6b7464dc59b36
 MISC metadata.xml 321 BLAKE2B 3dc8aa546d5d86ecf848c338ebe8e931681f5cc3879187206e8dbd41378542f55e12f577a5826f873eaf315dff7f89c3a45394a90d73cde2ac43a65e92156ae5 SHA512 9c0374655261ecff333a0e004ad2fe9e0ddb79b0064f45e4ed03121caae7acb136b5ca10d8e86d74cde50ed62695aabbf80b47d493570c328f9d46956e4c2305
diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild
index 3e45c4921241..2f15c2e0e766 100644
--- a/net-misc/openr2/openr2-1.3.0.ebuild
+++ b/net-misc/openr2/openr2-1.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol"
-HOMEPAGE="http://libopenr2.org/"
+HOMEPAGE="https://libopenr2.org/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2c83cbbfaa5e..f37cddb096ae 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -3,6 +3,7 @@ AUX openssh-7.3-mips-seccomp-n32.patch 634 BLAKE2B 12e931e6c2364d4cdd3f0d9ef8cf7
 AUX openssh-7.5_p1-CVE-2017-15906.patch 1180 BLAKE2B 37fca347fc1fa969f410d514a76b3d7133914aa14c7ef577e6eb0b2f96b936313b20635c6cc23b5e91e3643e26c899e992b82769a5df6568d058eb4f7a43fab8 SHA512 dfba25e9962e4398688d5e6f9311de44931ea5292d7d50c69d8056838ceb41ce099c44f849c204f7b421515c3aa40bde6e9b98b80b9e99aa113c222841daecd4
 AUX openssh-7.5_p1-GSSAPI-dns.patch 11137 BLAKE2B a54ed4d6f81632ae03523b7b61f750402d178d3213ec310bc0e57c0705ed67607a89a786d429599395722eaf40b2fb591c5b8de87ffc4f1dd7f6713b543c31c2 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e
 AUX openssh-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f8567e4e47de3d89b1d865bc92405da75bf7c64fa50b9f746d9c494dbf64bc09e04afc1960f673e68ea1d072a5381027afea63d SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550
+AUX openssh-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1f783669c3447ea3c80c5c0f9b971b86ca1e79e99e906a90a519abb6b14db462f5766572e9759180719ea44f048ef5aa8efc37efb61d2b6ef7 SHA512 f35b15f1e8d0eb276d748ee14c71004c6599ddb124c33e2f84623bc9eb02bb4fd4680d25d0ba0289d6a723a526c95c9a56b30496bdaa565bae853bf3d1bab61f
 AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7
 AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61
 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
@@ -27,20 +28,16 @@ DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e
 DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2c64ae6b9e49704f46f46a21496a71d5ebd051ab648446bf71ef141e2114f4a03363d8cd043f5813f957c2c5f2e2eb193931d SHA512 1c0fea91037bfcaed7aa3f0cb01d262410a99d3e1b98a25a012db5d683f3275ab52f78f1e446bd7e543c78f9d406b1dce2bb3997214534ae94e11c254658080f
 DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
-DIST openssh-7.7p1-hpnssh14v14-gentoo1.patch.xz 21448 BLAKE2B 51d9324990d8098707359f355b9212679db38569e566f47659ffdae8046bdbb4e6873bd67ecb7da0b5706c5243f44f82089f08ecbc59c7e39062fceb4be78316 SHA512 63d2ffbcfe121ddedaa07955b1025d2c6e196ea694464610437368835cf46dd507d4d17361548cae93db53a1e3d93d9c409910620bbd0cd619d82b6215c833b5
 DIST openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz 22060 BLAKE2B 81a7f3d1346718c154b39920c126eb0b00ae43f1369d882b8a1bd0b885668805639d869581fb49a8e7c67b61d72a904fde45841e4396af426b136d6d2f0a0dc3 SHA512 7b437bc061677aeabe561ad74bb19bc6f85369119ad8a92fb430fb5c1394c2bb3afd472ee66b285362b2041f871c56633dc94fec33cb062c6b1817d63c1d4a78
-DIST openssh-7.7p1-patches-1.0.tar.xz 8176 BLAKE2B 196b756f72bb3fccc927e31ae1b94adc3c9116de25258ac599c3653cd1234ff33f3dc608515a5ef56bea05191621974342bdb164b721c94d2c29a0de74731742 SHA512 9d56e306a5886a19d58c7a42389a82d8b912bb9250f97f64e9bf9752fc92e671539b24b0568f21072fb1ba7185e6bd1ec33511a39d26d48a699a911b910121c9
+DIST openssh-7.7p1-ldap-20180327.patch.xz 19760 BLAKE2B f316ea65de3415b9ee19a621f36c5ce7e4bda7e1fe06e9edbc1e96e9d7296facf1a59dc79822939035c333a07b04a21d33c116fb74f36f1a93ac6849a4182166 SHA512 6439057839341169f9a198b25fdcbbddd50b0db0834aa762c16fb9b9b2e6b95b4ee9b4c6ad1cf2723750aacded4e6cba7f6036cdd91cf8d5e88eb21ea83790dd
 DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039
 DIST openssh-7.7p1-sctp-1.0.patch.xz 7380 BLAKE2B 6ad40972ece131ff148ede6ba94d63bffc606e0bcabb959d4c9056196cb6f4fddc285f97d7b49b73fde7ee84e3c981c07bddb058ad88eb7c7c2fe716e657c630 SHA512 bc5f50805ba25415f93f61b6654e5bcbaef673b0af48d339116ca9c94b6152afae294c5a9144adeb40190da97c2fc73b43e3ac7ac34feb4a647628327a7cac0a
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
 DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r4.ebuild 11115 BLAKE2B 31bfee62343a2124e48733c4db1367fcce121d5eff25008135d2e715a34a45a176c02a5fcee99271db723d437a62d0e79297cb17df1b1ab6a12534ad2cb0c0b5 SHA512 00dbc65bf70747906f2ae5ae538579b5bd4935bae224c59ad2de92820fc64f969ca2bddc1bf0ed8924f7b6825e5665730e3fa65b5682a7f7a170233b41b73acb
-EBUILD openssh-7.6_p1-r4.ebuild 11099 BLAKE2B 975314f6b62e9191bf6300becb51f6282e52edc889407996ba640b07755dc713f28f9669e84a7f269d2be58764c561d7c2a14ff9af03ea7664794eb7f8656d9a SHA512 40276711daceea7e595a57b9805d5a4099e644650c6d2b501d581f5297bfc59bc20b325db455ce9e959d1a8d85bc25471e873177af5feadf1813f50205d6bb35
-EBUILD openssh-7.6_p1-r5.ebuild 11292 BLAKE2B 0f8a0e888c539172a72cba3fbc08727de705df525c188e71f6f3e0fc7a4f314fc18b60e2c5fa09c35953b0684dc0ab69c0413172463588deba215af2688d22b1 SHA512 5fdc1fe303b7e183da3948fb177c5963e13df98cb61f24a81f291ff67c4820dc0afd8bc9d34077a966ccf5fc9fb7ff8f936689246f54686512ec45f61e3b7a97
-EBUILD openssh-7.7_p1-r1.ebuild 14657 BLAKE2B b7539268f745f7edf9f654992a0971dd6d77c609b19f945ba3230a3901b85a675f8c951d146089efc238d66e9a0b5d38e1ab5272133e2af8aa4c7989dad8461d SHA512 e2bd77e37b10bb12350da25468a7f1733985dd375824e572a2de0df84cefdeb7bb1fda30014f9a5a3b86aa546c8419264f2b5b761a77482bf3a4fa65bf8a4e72
-EBUILD openssh-7.7_p1-r2.ebuild 15138 BLAKE2B d11f235d48f444750b33cc0964a997caf441601cde53249dea80ab060690562a596f8c1f99acc41d12bd8ecbe96aa4f3bcb328f123899de28d37667ae60d268a SHA512 833d01ce84557187c1109091ae04f3b53b6119debd412c14424219d7054f88aa6ab01644ab0ebe2beda50cec22f6c7bffbbee13091c369137aebb15542d250d9
-EBUILD openssh-7.7_p1-r3.ebuild 15119 BLAKE2B 76116b847961f3e5d57f47245a3edab2e86b81aa7906d4fd8cbc894d7f300d87fe6c9f8323821d5652d85971ec3e249a8b67568c9e4fa74550123df6f164461a SHA512 bd61079fc0731c03c57300696a7cad1ba75052139971cded7a7fe99b91d428a86350fe2979962e27a664a56957b8ee99f73131b9dc22881b40f66d417aca6ef8
-EBUILD openssh-7.7_p1-r4.ebuild 15571 BLAKE2B 43136015d7a9110d2910ad13be455cd21e469d980d20ab2abdbc09f0b3aa33d57cd191444c679eda08dd232767f6c9b45aca9f96f9cd12d4edf079a4396d1305 SHA512 e7db97cefb29d6cc5264365f85d950035ac7978ec93f0d62723f244bd8f5483e7f4c6348fc169b7e63201ff331d48b22122f134d7083fb3fd315d9e01124cfc7
+EBUILD openssh-7.5_p1-r4.ebuild 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
+EBUILD openssh-7.6_p1-r5.ebuild 11361 BLAKE2B e8f1c1c092beba9ded4301c500d85b25a06ffefd854e1142a0f60c3389aa648cee54b865c8f0ffbf3a45848e5c2f26b0bafd9f0d1e3a982db0a8dd0782cd6b69 SHA512 3389c069d119242c624ff93f6f2de1e74e582f761ccf810819d77035dc77273b87b036252c3daba824e38ad9ffa854dc1c0d8c259056cdabfcd40405c5d66072
+EBUILD openssh-7.7_p1-r100.ebuild 15950 BLAKE2B 3affcb3ffafa9acc8597d77d0cb0deb738e7b954abda30524b5b331de5dee3b2a3f4a12061bbbe9c467acc30d7fbe96267be0324875be7b2ef662fe52e5c5727 SHA512 c02ad19bafa70a55ca6d3484a6341efba7f71256fe2103ea48fc3e4de399307229aadd2a79b13ad53b9ed6b79cfdeb4f678c654cfbdb6f78bfc9cc54e7505ecb
+EBUILD openssh-7.7_p1-r4.ebuild 15636 BLAKE2B 214ea3d110b66919cd6a81927136cf059ea920a75f178b36f3de1468d177218e9af25f5c8cf100265baec50999e187ad63eeb13242fcc408beb4f9c5f6f5f1ef SHA512 48814f9719a2c799e731212dbc35a8712e7dc2ae6d859ad80270c0e5d4b45b8feaf5c24961e560958839626c9855508f7684a9897199b7485ba9c533c47bc697
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch b/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch
new file mode 100644
index 000000000000..a5647ce9d8d3
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch
@@ -0,0 +1,20 @@
+Disable conch interop tests which are failing when called
+via portage for yet unknown reason and because using conch
+seems to be flaky (test is failing when using Python2 but
+passing when using Python3).
+
+Bug: https://bugs.gentoo.org/605446
+
+--- a/regress/conch-ciphers.sh
++++ b/regress/conch-ciphers.sh
+@@ -3,6 +3,10 @@
+ 
+ tid="conch ciphers"
+ 
++# https://bugs.gentoo.org/605446
++echo "conch interop tests skipped due to Gentoo bug #605446"
++exit 0
++
+ if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
+ 	echo "conch interop tests not enabled"
+ 	exit 0
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index 5574b9b318ca..3deb8a130f70 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -130,6 +130,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
 	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
 	epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
 	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252
diff --git a/net-misc/openssh/openssh-7.6_p1-r4.ebuild b/net-misc/openssh/openssh-7.6_p1-r4.ebuild
deleted file mode 100644
index 01600c378d29..000000000000
--- a/net-misc/openssh/openssh-7.6_p1-r4.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_PATCH="${PARCH}-hpnssh14v12-r1.tar.xz"
-SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~chutzpah/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( https://dev.gentoo.org/~chutzpah/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S="${WORKDIR}/${PARCH}"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	eapply "${FILESDIR}/${P}-warnings.patch"
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}" >/dev/null
-			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			popd >/dev/null
-			save_version X509
-		fi
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		elog "Applying HPN patchset ..."
-		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eapply_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	# remove this if aes-ctr-mt gets fixed
-	if use hpn; then
-		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
-		elog "set since it does not (yet) work with >=openssh-7.6p1."
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.6_p1-r5.ebuild b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
index 46f1d676f5f3..4c84767d1169 100644
--- a/net-misc/openssh/openssh-7.6_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
@@ -111,6 +111,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}/${P}-warnings.patch"
 	eapply "${FILESDIR}/${P}-permitopen.patch"
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
 
 	# don't break .ssh/authorized_keys2 for fun
 	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
diff --git a/net-misc/openssh/openssh-7.7_p1-r1.ebuild b/net-misc/openssh/openssh-7.7_p1-r1.ebuild
deleted file mode 100644
index cfcfc30327fc..000000000000
--- a/net-misc/openssh/openssh-7.7_p1-r1.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_VER="14v14-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz" HPN_DISABLE_MTAES=1
-SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
-
-# Disable LDAP support until someone will rewrite the patch,
-# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
-#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
-	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S="${WORKDIR}/${PARCH}"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use sctp && maybe_fail sctp SCTP_PATCH)
-		$(use X509 && maybe_fail X509 X509_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-
-		einfo "Disabling broken X.509 agent test ..."
-		sed -i \
-			-e "/^ agent$/d" \
-			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-
-		einfo "Patching version.h to expose LDAP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		eapply "${WORKDIR}"/${HPN_PATCH%.*}
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-			
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use hpn ; then
-		einfo "Patching packet.c for X509 and/or HPN patch set ..."
-		sed -i \
-			-e "s/const struct sshcipher/struct sshcipher/" \
-			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
-	fi
-
-	if use X509 || use sctp || use ldap || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	eapply_user #473004
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
-		# We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp}
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED%/}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED%/}"/etc/ssh/sshd_config || die
-	fi
-
-	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	keepdir /var/empty
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.7_p1-r3.ebuild b/net-misc/openssh/openssh-7.7_p1-r100.ebuild
index b06772ba1b8c..8aa36a58819a 100644
--- a/net-misc/openssh/openssh-7.7_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r100.ebuild
@@ -12,12 +12,9 @@ PARCH=${P/_}
 HPN_VER="14v15-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
 SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
 X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
+LDAP_VER="20180327" LDAP_PATCH="${PARCH}-ldap-${LDAP_VER}.patch.xz"
 
-# Disable LDAP support until someone will rewrite the patch,
-# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
-#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
-
-PATCH_SET="openssh-7.7p1-patches-1.0"
+PATCH_SET="openssh-7.7p1-patches-1.1"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -31,7 +28,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
@@ -112,6 +109,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
 
 	local PATCHSET_VERSION_MACROS=()
 
@@ -140,9 +138,17 @@ src_prepare() {
 		# The following patches don't apply on top of X509 patch
 		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
 		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	else
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
 	fi
 
 	if use ldap ; then
+		sed -i \
+			-e "s/ -lfipscheck//" \
+			"${WORKDIR}"/${LDAP_PATCH%.*} || die "Failed to remove fipscheck from LDAP patch"
 		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
 
 		einfo "Patching version.h to expose LDAP patch set ..."
@@ -359,7 +365,7 @@ src_install() {
 
 	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
 		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
+		doins openssh-lpk-{sun,openldap}.schema
 	fi
 
 	doman contrib/ssh-copy-id.1
@@ -424,4 +430,11 @@ pkg_postinst() {
 		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
 		elog ""
 	fi
+
+	if use ldap && [[ -n ${LDAP_PATCH} ]] && has_version "<${CATEGORY}/${PN}-7.7_p1" ; then
+		elog "Starting with openssh-7.7_p1, the LDAP implementation was changed."
+		elog "You must revise your configuration or your previous LDAP setup will stop working."
+		elog ""
+		elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for migration details."
+	fi
 }
diff --git a/net-misc/openssh/openssh-7.7_p1-r2.ebuild b/net-misc/openssh/openssh-7.7_p1-r2.ebuild
deleted file mode 100644
index cb49cc970e0b..000000000000
--- a/net-misc/openssh/openssh-7.7_p1-r2.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_VER="14v14-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz" HPN_DISABLE_MTAES=1
-SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
-
-# Disable LDAP support until someone will rewrite the patch,
-# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
-#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
-
-PATCH_SET="openssh-7.7p1-patches-1.0"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
-	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S="${WORKDIR}/${PARCH}"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use sctp && maybe_fail sctp SCTP_PATCH)
-		$(use X509 && maybe_fail X509 X509_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-
-		einfo "Disabling broken X.509 agent test ..."
-		sed -i \
-			-e "/^ agent$/d" \
-			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
-
-		# The following patches don't apply on top of X509 patch
-		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
-		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-
-		einfo "Patching version.h to expose LDAP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		eapply "${WORKDIR}"/${HPN_PATCH%.*}
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-			
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use hpn ; then
-		einfo "Patching packet.c for X509 and/or HPN patch set ..."
-		sed -i \
-			-e "s/const struct sshcipher/struct sshcipher/" \
-			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
-	fi
-
-	if use X509 || use sctp || use ldap || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-	eapply "${WORKDIR}"/patch/*.patch
-
-	eapply_user #473004
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
-		# We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp}
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED%/}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED%/}"/etc/ssh/sshd_config || die
-	fi
-
-	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	keepdir /var/empty
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.7_p1-r4.ebuild b/net-misc/openssh/openssh-7.7_p1-r4.ebuild
index e884e0b9d3e6..d48f83135200 100644
--- a/net-misc/openssh/openssh-7.7_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r4.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
@@ -112,6 +112,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
 
 	local PATCHSET_VERSION_MACROS=()
 
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index af88a7b171fd..5ec8d9008b08 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -8,4 +8,4 @@ AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
 EBUILD sitecopy-0.16.6-r1.ebuild 3337 BLAKE2B 325be931832211c6c907001bc3d6068dd065acb387047763d6d2397d01b42315766922149cac38196875bed45c9a809bac86af017d37ae3a053506ecf6ca958e SHA512 90974bfa8bafed38ef4886c932f3a569f1db7e334e07819a046138d3f9495c91e75d184b58237a7b958837ec0f4fc85ad77fc8270657a578d17e5d257d180128
-MISC metadata.xml 809 BLAKE2B f0d5933537e30e3f5ea0d070bbcf7fd46679bbf4310e52503ff2413eb5ad7eb24bc1234255ef2fbd900b9d00f329da8fa46b1c9111ec67f7180c5f72160766c5 SHA512 cdc52dfc4f70c35e899bcc1d1195454e8ae28c28cee78b3e39fe5a45bbfd86a1ebd3cf511a44729a6bee3da10e19f84b3ef5b0c3e31c44e1843e051f0eae5110
+MISC metadata.xml 612 BLAKE2B a17fd5ea60dc914fe857b32afdfe0782476d638106827e0c2ea22a5b7a365a6edc32eaca49d81089cfb19f5a7a239e63fb51653a7328bf94f2d8299ee8a14722 SHA512 04589e21fc83e206866825876bec4a4717708fff8b1e7192188f31ae08c278892ca286a362040cc21c0feb6041f413657ba9118b854f67cbe1ef3a9f8fd8696e
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index a29e9691ddb5..4c6d13fbd699 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rogerx.oss@gmail.com</email>
-		<name>Roger Zauner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
 		<flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
 	</use>
 </pkgmetadata>
+
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index e27668783dd9..007c21a9b884 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.05.18.tar.gz 2963277 BLAKE2B 4e33f5c97ee20313bad1a4b0ccba55be08177e3c47342f163a04e23e3ce22bbf4e15e620bd5c5c1e1e7a0e3f2e422dc9cc2c213af27a25b40194e3ea93fa98c1 SHA512 99527e5aabf12018037c39d5ce4e3ca67b8848f84106409b8d5fd5271eb6ed53b49abbe5939ab5558ed981a5aeff730b2e27589bbc22d3d616061415154ab9bb
 DIST youtube-dl-2018.06.04.tar.gz 2972929 BLAKE2B 77f1ef9b869ea1b3b98d4deb064d959d3d05ae1732c2277cb5e2143025efb91196d2acd446f24ddd7aafbbe7275c066fa6a032d4a57930b62fb9fbb95ca45e29 SHA512 f354cfc77c6532926bf2a20a47a4b603bdf81a2a15997f493785e76eb0688f13ec3d4b3217f7d6b02d9a83366fbd31d5be6f579551bb179ab6008b85ec3675b0
+DIST youtube-dl-2018.06.11.tar.gz 2975160 BLAKE2B 71370535655385fc52f6b1eca19aed61dea239ae4d58a37166b8a0854a363b59ea1a3599952d89e5c41862f89a685b419834e360ad57b55ef3103fd1fb84f337 SHA512 fb11d9a5302f60562ed537cfff9a4c4dfa89665acdf8f19fe24dac0b0ebb1a5bb3c60b5a01efa42f738f611be5cc9fce43f952f2da057989105a7603c9a17a03
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.05.18.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-2018.06.04.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.06.11.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.05.18.ebuild b/net-misc/youtube-dl/youtube-dl-2018.06.11.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.05.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.06.11.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-16 05:02:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-16 05:02:38 +0100
commit	f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
tree	c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /net-misc
parent	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)