gentoo resync : 28.09.2019

14 files changed, 152 insertions, 368 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bb64917acf90..0ff5bd1c5416 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 57e23738732c..e43863480f3f 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -3,5 +3,47 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
+DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af
+DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
+DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
+DIST github.com-frankban-quicktest-v1.4.0.tar.gz 26586 BLAKE2B 365dbf6520d5e4b936dfa71022437012b45ca8d499998af8b204fa2f4ad00086b8adbd7c871e494c0a45481809253bbdbb10c05e72f3e6247b29148b61f7a7d7 SHA512 5fb98186c0ce5c96858bd9c018a86f5db2d5b04d7d659a9aafef16e6abb6ea9fbe076c84e74d5b8c5cf7e8460f273bce203dedce0e3ce6c024a16f588acac20d
+DIST github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz 31594 BLAKE2B c97dd0f24c42ac32ac9534de280ec9f5ab12e7d91ccd6ad9233b4145c9797c28362c44242faa95fb9f051ade1d5457b7938def97019ea98e337c57d396aa6c86 SHA512 3b0a79ee3dd9e4c321a549ff8b08788ea1bfad34c29cdf42976e955716f2139b3ba7c40e8bf36d8dac01711d590fb2ab26767a06222fe4645856a401219a481b
+DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
+DIST github.com-golang-crypto-4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz 1693268 BLAKE2B b19803b58d5f242bca292c1b6e69b5cbeafa908077cec327e9d502576ecb2e19feb2bd131431ae0cb229cfac025eb36ece5f6ced66d0f075e233719aefde6a29 SHA512 fb3da32e55a01c4d8449ddbd9bcb3d2491d2ee9b25e42fd0bacedcd3dc5d35125ac7e57acc27fe57fba63ace43008205041a7654e681c7b91e20d4de6ee28e2d
+DIST github.com-golang-net-ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz 1099752 BLAKE2B 6300e151f53e5a5886000fa82e9567d644ce0f769588f4f8e3d443208718c36ef790ebe4fecdadc9517b232cfe881c63bba215a649e429304e612af473cce0f5 SHA512 8ba27323bcfdc8f7e5ad3061906bb993c0a91a3da1812768f5652553f9f06ebb8ba35572d5512e65f7ec10363e506779cfaeb1111f1b7db95fa012b9ff64495e
+DIST github.com-golang-snappy-v0.0.1.tar.gz 62605 BLAKE2B 0af2dc71967b38aa4677e5286c8f0fe4167deedb32f065d9612e318bf1e09dd220014e5b05d30418a625dda138dd33ced8b9e73781f2c6e8f7f301246c8103d1 SHA512 87a934b1b5af6a19341b99170d6dfa078ca33753a4c1b2ec120cb54c55a51bb4e808d38d77d498115c9c53678adddf897b4bd81b7a9480564c57a209e2745f42
+DIST github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz 1457004 BLAKE2B dc4d4fb792c03cdeff86a55651567c69589195b2947d8d33fa9084cae9abdb4bde02258e60d42bc55fb99cfd293ce52810b77d1fa1b4e4506ff95b0b501d0e20 SHA512 455fa30ab338e2dfe5d289c5a81267138358d28a49fe5932c443e59def5ac50e36cb549b609c77bf8f6a0928567e0c6fc1faed71e092e91c73a00462382332b3
+DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
+DIST github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz 9392 BLAKE2B 9c06e2cf9a4d51eefa4d687263bd64ffef69d1937754bff1aee0a51c441510a9ce2e3193c361632c45a818b3cdd906349f44c9ee29f1fbf5c405d68bcc4b9f89 SHA512 2e1bdf8a182875315f776c556a1ad8cf2f8e3ceef72d386b8bb7dd5a3de9d5cf2216e2bbec58d2aada149f4a332fbcdef639d6479923f5a0139bb9ed3fe0f952
+DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
+DIST github.com-hashicorp-consul-v1.1.0.tar.gz 11125956 BLAKE2B 61a8c7463f6659368d990626ebefa20bc545f17e66fb0a06a178e8cf7cb83637e64cf7496ed93facab73ef2340d46b08d7f86533378a7e57530ce1a959a9f398 SHA512 80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721
+DIST github.com-hashicorp-errwrap-v1.0.0.tar.gz 8346 BLAKE2B b407c23ddc2daa5534e38f23d69363d47012fcfcfae4e75f31513ab9fbf3d05f101258afb2bd60009aa4a6277eebe7c2396db5cb713670ecba6589a0d4b9dccc SHA512 f3bb952d98bdaaed055c4d4adac0a727459964645f8c6bf9becb03ad7eff4ec71e8e4047a29c446ee52148a0e201aac3d4b47d05bd750627650ca0e84c91652f
+DIST github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz 8069 BLAKE2B 36f2411ec94ba71b4360fc625d19fe995606560d92a4b08459b490831a4d4fda5114622cfe1aea2d100e316300a107045b9d5ce217d3748ab142e49c662ad880 SHA512 a94953d10485bbb6b1510036c8b87dac1d3ca41f84b1b397bb987ae7df68964e082ed09d9b57cfb8439735d246e599a7848882810699d26505662da735cfd406
+DIST github.com-hashicorp-go-gatedio-v0.5.0.tar.gz 8250 BLAKE2B d5a51c4ed7c2d6b3689ec50118a0543b0b581b140667b67f4a842ca6299d392832c10c6512b145f4aa372d97de47b62c29565d01f231cb41b830e18542ea26df SHA512 378cecb6d3f0f13d892ee087ee8335fa7a75b9feb8af549e06d4c81372961840767ecf7d706f0602a7b47c692abad96016c158b5dc3973dac9667fa06114268d
+DIST github.com-hashicorp-go-hclog-v0.9.2.tar.gz 26486 BLAKE2B 127105115f962a019ba753c1a437e192c2d8fc3dce346247fede375f49c2ba10edac0e5d2baff58eddbcc0cf2057bc6128e6cb7eb02cf8636dc795eb7f5f945d SHA512 3dfa8cda3dd87f82cc0b721f664ab2f39afbe644ac785b086023b50432a904396fa33bf5fd933a50951b8059f88d07ea9017c9d5e5150379c521a1739c13527f
+DIST github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz 22073 BLAKE2B 13961a0b78b894d72d33575eb58e11e98394952504fd62a0ccab70bb3d86dc7d6faa1fe314b0fcd8c835c004c056a23c59d137494df423c2470b938204c5f7b3 SHA512 85e4754e7d4cb19c00717d4273b5d8f5c68aa3349a6f28dfbd2f879be26b7d3711a2b5d092512a720946d5209d47ccfeb76d0e007b22354b2b9733daf90aa45d
+DIST github.com-hashicorp-go-msgpack-v0.5.5.tar.gz 50069 BLAKE2B aae96b54b58b0eeab45956431cd3b5ce2115e5ff82a66e3b803bf2413aff2ebbaf9da9d6e9069639ee9828b0a9ba967888248d658c93c0085a920f8d9e408812 SHA512 956fb5839348587bc85385a2d822824001b5f08ab30c5e3fb5f82c1536021c8e2b429a736e04ffd6b338e7128caba63284cf9cae955451aa8444615937754cfc
+DIST github.com-hashicorp-go-multierror-v1.0.0.tar.gz 10066 BLAKE2B 3df1a8bfbf828e01f5bdfb1837a47ed3cb92acf1666f2abdef2ae29e643fa2d4982018c3787ea696397ee6eb8ae760b5f7445bb3dd256e1a35a8eaf8f1149e42 SHA512 958dfeb5fee67d242e70ef6289f598754d28dec6a05f0d2e3d8b92685fd84dc4543108fc391d6f1190c667415e082745a376fa2ed4ceecb190f6f7f3b77c9d6b
+DIST github.com-hashicorp-go-retryablehttp-v0.6.2.tar.gz 16094 BLAKE2B decf767f16ebb793c2d7acf7698f4ad753ab518ccd805cf50c6bdc7c557c20f13e360137140cf10823948a0366035fca9b78a978fd0ca90ed5bebca8b72a7814 SHA512 c403931112f812d31243145cac941dbec65a1253063e152fdb8c0255bfe37fefaadea4cf5bf145cd18d3f5f3fe916a1d7ce82ca1c396e528eab32ae24b74d1e6
+DIST github.com-hashicorp-go-rootcerts-v1.0.1.tar.gz 11786 BLAKE2B a84d637ba320f503dafe0f546addb3dde7e65dc7c12caf25b2a96969e4c328b88eaa3dafda9a44bd34e91d285d91c552ae70f4a7f3aa5060d958f7e17bf98327 SHA512 da55cbe3a9ace70a7e2ccb2d10dead996e6ecca1fc5a533b8609c5b14589742947254a98acfac8711860cdad98be88afc4afe0615b722361b09f21f86ffe5dc1
+DIST github.com-hashicorp-go-sockaddr-v1.0.2.tar.gz 663049 BLAKE2B b898d7563b426498e3d4e589cfcadae21d6931a82b7d34efe9d80f6ccc64def45e88a0532f11bae4c83b341f23394c351b39d3a83acca2687c5ff3f73f67de31 SHA512 9a9ab17b598be33513f3baa1d456e5e223a6857fc86f9d2104823395b1b344bbf6b27dde45b87fdfb038e36aa368b188177b28ab4abdc50c29e4b1c1f71d7b87
+DIST github.com-hashicorp-go-syslog-v1.0.0.tar.gz 4517 BLAKE2B cab2b9569356395d07b58de464639048654c4acb48f44bc6d125ff08801e666adcc07b8b47293200eab5ea54490a86c315aff6ebae4a4001218c6582919aede8 SHA512 8ce3188cf62a6c168a5620168e5ae89eea1dc374c1242acde74d69944eb1de6fc6155bfa5945ee52edae816682f65926b53808219ab3cccd6b2ba1f1b8707fbc
+DIST github.com-hashicorp-golang-lru-v0.5.3.tar.gz 13348 BLAKE2B 598db380ae34bfc568d5a048e991e9bdd6d486800caa4c7d27ea96877f47e5fa5448b3bc30aa9d800a41755f9a17189c36ec738b8e7c00a51f2a80db3c270a1e SHA512 8775349e1c9df60a57a425f506ff53a1849aa4877a878583b59bc53f3e746f5b6c482ded9bed9182c68e1d12c5acc4bacebe7a6d41440234d4b40361bddb805d
+DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
+DIST github.com-hashicorp-logutils-v1.0.0.tar.gz 7753 BLAKE2B ce8516f7f34790b36630dbb40ecfdd79d6e582b19ad95f1258ae5c8f519cf03c29f9cc4a0a9b90c2146f9aacfda8e89a19969646512c1db4a684dfba0ed9a033 SHA512 079a279f92977dad2a0bd7aaa41983478e7d159a405108cbfd64a36f66949ce20b73b7cc321ab15f116c82f72467ea051be9038efd26a1bff96da081b9896ed3
+DIST github.com-hashicorp-memberlist-v0.1.4.tar.gz 86880 BLAKE2B 99e7de2439f16df6ffdc6c0a23be8199929c5a3719b5339351a66bc9a68849540a6cefd20bd7155275acf5454254ebb3cd76bf83aabb602ffd6a5515863a8677 SHA512 948f8a80fffb503428006e97f80ef18836140f5beac525254da508acbc04c4875d1e5389c881b01d0c6d2ad28be4ed9a9d5badda0ed805a568335e12a7572be5
+DIST github.com-hashicorp-serf-v0.8.3.tar.gz 1970313 BLAKE2B 80ac6693e40ce7fbef5b14ad078d11d3b4d449c5d1057a4d25486b62f9d03630d69c95b5e0b863634d4d3774867a2cb0305951efe99487da0d4e26fca7fcf726 SHA512 1ffcc9f34d2a79c2112e394292b587680fced0cc0cd81b8ab40bb82059e0fd3155679f945c1af475efcb20cc2427d0da625d859fecf79fdf54b9d31b0f358502
+DIST github.com-hashicorp-vault-746c0b111519166ff2126f55dba7071912c33006.tar.gz 27595435 BLAKE2B 0ad4543ba99d309d615bf57a8cfd93d8810fdd65f31a89106eb56d6cf6b5ef154476e191d150ca42c51e13d87aadcd15c8e4aa831546b49d271fff893bdec4f8 SHA512 088777c45f8eadd2c4b78617490a4dc20a849d3b9644ec755340562695bb99e3250df056f6b91f104ce83be40a14dfaebdd29efb695a0d713646e8da94850362
+DIST github.com-mattn-go-shellwords-v1.0.5.tar.gz 4261 BLAKE2B c4ba9bc37d550ffe1e8a4447928aa4dbb652c2b8478eb4a9485e5f018896bf0a1ceb8cc02322a33553b81c2a64ef05dab5cd7a3acd973b4ed9691c5751eef688 SHA512 3b6607f35d7d617a2ba913f8d697b82e0ea867410572a29373ed09fe1b1e1e84509003476de39292e498601571cc1f78c3981ce14b04babad84bc85c6d9ad670
+DIST github.com-miekg-dns-v1.1.15.tar.gz 1692734 BLAKE2B 3b657b7432ec4cf9b4a89860bcd7a0bbfad151603a3612edc2cad5aad45ecb1b9934a1b405311bacce69503a946e0912530ef13f216ba65f5a6c5d8ad1a2737d SHA512 ced9d3e594fd48d727e0a44204bf6c6b3575392e364132a15a3d61b862ea66b311357f720bd547c605512eea1cbca98df01a598e36017862ee09ab04929722d5
+DIST github.com-mitchellh-go-homedir-v1.1.0.tar.gz 3362 BLAKE2B b3388de9230439ec591042f6a319a80216c0bd7ef055f4bee42bd9020ce8104afb1d10b6105cd2a6f431f066f78af1286537236c054c3bfe15c7ee9b10e1935f SHA512 19f3341d9b343d46a215da3d9aba8e218cd4a5e22a33bb26ee296ab3764e9ab7befa7b65f05bf7e9af8b28be1f078e7da691b68c0a7b1e0c8d853de3ba53d643
+DIST github.com-mitchellh-hashstructure-v1.0.0.tar.gz 6507 BLAKE2B ae7f4e449f2f01adabc0163dde5b403d5fd4e18d247aa9296f4b65fdd6b0f05240b05b25cef3a1389430d63ac8bbfcbccf4c3af300a61ba0494e312d5e282a52 SHA512 a2b0688cb9e352c3ade1a928ad6c3bb9feeb066703af4b125789f045537677898544b97610272edab1476894c261c558ba6ca95e32a894f5471dfb055cf88265
+DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
+DIST github.com-pierrec-lz4-v2.2.5.tar.gz 20499382 BLAKE2B 88f2958f165cfb09a378466d05835e6d684671349c206434bf58ad57a01dd4204270210ec369abbcc5015a385f0e47424ea19fe0104769aff0b16f9f9def8506 SHA512 c32f85fbcb71e41cb4dc60eaf29987b177919ab40deaef30f2d21da521112b1c80bd23073451a4d1ce455e547efc961ed4d1106e12d97890f303580647cf467b
+DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
+DIST github.com-ryanuber-go-glob-v1.0.0.tar.gz 2969 BLAKE2B 152f01873947fd0e17928b7ef86b826bdb66f1d2e6a4139b6963a5ce2133567816488d7dd240221b15adf56713094bcd11b155ac29faae04590b31f0d566c1df SHA512 fca7548194624dda5d7b5317a29c3a1a6bee44ecb3b62772943dca8afb5e665c9c3c72c740a91a7052fdddc50c60fe23917199cb67d79cdbb8b499f13a34f768
+DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab1e7fb81ef45b1f4be63a854c49dbdb2e537e9dc63f0a0478373e20ab437560fe245bd71172434fe19da42ee571bc0b48fb540fb31e12 SHA512 cc634dc543674016db6b52cba8235885ed3236f360e42992b55471b07dc20762c490edff7276d84109d1d46a9c052fb8fb62cfa002e91b1cbe43f00ff152727e
+DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
+EBUILD consul-template-0.22.0.ebuild 3306 BLAKE2B b5c6f9977cc1ac9f497b9c543729921c2ac036c1ed75272094e95029ffe2f1bf68aad307574ec55cc1a39ed2f80d8d2535f280ef635a586f359b0cc0e9a519b8 SHA512 bb59f560b81f53a4fa41fbf71fb9af6b728518d6c9769da86332f5f8863f7546bbe6362801bd2b4eb830d926a07bae7a6d8182fe12088b30ac407f4e1d162af4
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.22.0.ebuild b/app-admin/consul-template/consul-template-0.22.0.ebuild
new file mode 100644
index 000000000000..b43c4c0bc0ec
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.22.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/armon/go-metrics ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5"
+	"github.com/frankban/quicktest v1.4.0"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/google/btree v1.0.0"
+	"github.com/hashicorp/consul v1.1.0"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-gatedio v0.5.0"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-retryablehttp v0.6.2"
+	"github.com/hashicorp/go-rootcerts v1.0.1"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/logutils v1.0.0"
+	"github.com/hashicorp/memberlist v0.1.4"
+	"github.com/hashicorp/serf v0.8.3"
+	"github.com/hashicorp/vault 746c0b111519166ff2126f55dba7071912c33006"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/pierrec/lz4 v2.2.5"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/stretchr/testify v1.3.0"
+	"golang.org/x/crypto 4def268fd1a49955bfb3dda92fe3db4f924f2285 github.com/golang/crypto"
+	"golang.org/x/net ca1201d0de80cfde86cb01aea620983605dfe99b github.com/golang/net"
+	"golang.org/x/sys 1393eb0183657fb29200106b17a5042ec6e48dbe github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time c4c64cad1fd0a1a8dab2523e04e61d35308e131e github.com/golang/time"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/square/go-jose.v2 v2.3.1 github.com/square/go-jose"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GIT_COMMIT="005b42e"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+# TODO: debug test failures
+RESTRICT="test"
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
+		-e '/-s \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
+	emake dev
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin "${GOBIN}/${PN}"
+	dodoc {CHANGELOG.md,README.md}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+}
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index bd5c16e18853..4fa9f83e74df 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,9 +1,4 @@
-AUX lnav-0.8.3-disable-tests.patch 673 BLAKE2B f966d6d2bb2f0a4e888b0a286c01d898cfa07c848d39f6d74c865dd489b4a4a3dd36f177873cf41d1f63ac6f4d25956fab54d4b932b170adc795bce4da1fd174 SHA512 fba61b037e01d4bc91101b24ff706b51f0fd3541756add7f7e3f4240a803c76eca808073423531a70c2700359fe36b360a79de3766a8fea7e2ef276db2ef4930
 AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489
-DIST lnav-0.8.3.tar.gz 785911 BLAKE2B 47800f27de0ad585082abaa2af3139d79506bc74d86c175040792eeaa89268711d8fd4b3737412a3dc59a566bb880f9c9fa248e48d665d25f24e1f139f9a1375 SHA512 21d0229abf9b572dcc426b6a5e87b8c84f4eb0a7f37ed62d0c08b7bd7c88868a13262f9c78b6af3f3a492b5853b68c8cf8f09ca8d24e77aaa2f2ad0f0f128022
-DIST lnav-0.8.4.tar.gz 840718 BLAKE2B 3efa958bf8c8031a7c53db1a5277cf5cd17acfcc50583f0a9c5097ee7aa679bc3d9b8346e5fdecf91d053aba6ca320e5e9bcb827e0b0bf5c1a12d4d03c307b87 SHA512 79ef5712dbeea941f7d0a80652d25394ca4e278c983eef0b3ad9f22ddddb90dee13dc50ae475632673575ace795f793bbb8e14b85ac4df786b94743e7a7596fb
 DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
-EBUILD lnav-0.8.3.ebuild 774 BLAKE2B f34a27225f2ecd9716a27de2d231a8c25df5bb70aec763803980c2c54a573867265667eb2b0b84fc3aaca6d124f5fb6eccf1af4677c2fdb2699702a29c27fa43 SHA512 6fa91129af3860d4b47ebf342d633048aae4395558ea81173fbd86c5313b19eec3cf94addc9e131ce0f03c2b9a0a75c479ae314dabc29cd2a9237243ef8120fd
-EBUILD lnav-0.8.4.ebuild 777 BLAKE2B 4c6c25f873afbbddb8b29b9538301c1d271a0ccb89207e68b09a6e9a023531f3646534adf1fe1f1727fea864488cb0432e9f3e679748d8b23cb967a33bc378db SHA512 6b0c41b16a1fb4c7c5bc8de66474507ddc19f22f95d506fb63c5314672316d970cdf747b8d4adf461ec2a896d6a9edce38487829f119fcc35a79bf8d34f96b29
-EBUILD lnav-0.8.5.ebuild 784 BLAKE2B 16b2b2d99069aa0cc8e6da3cebd1503c535612c82896a528d17854def85dd2c2c0ff6e965be9ec6fa9d64c65e8f928a18ca558cc3977fa8bb67088c1d2b61f38 SHA512 97baef43264e2207ab5aeab7c7e5a1666cc697a9dffe40279770895df85716e02dbc46cc9f916bf9520e6a7b44760e2e7c3ceda431ef1c0c328397e31a0851da
+EBUILD lnav-0.8.5.ebuild 785 BLAKE2B 6983ddad1736c7d185b80407de989d928ec2709624ed18b8421170a0ec69ea19e858cc2d04f0250802219ffa0982bac843ce27e6fbfb49666b0bf481eac10887 SHA512 c6c62e21891014b3dbf6c0f8052020b5ececbe0190f45706e20cc0047c37d7a655d5afc959e3e93438a2127bf959057c92d12411de1a68fd2adfc7f0f3f73ecd
 MISC metadata.xml 332 BLAKE2B 2c99546c3e0f0ed5241279bcb00e56c7104b70b28991c50763ad3664d1d7ea2441a1b3f973c44f267c80dbc98eb3593579fa49092a0ed77d34d04503942338ac SHA512 38280dd0af700835f8fdb73eb9085f5c0a027ba9111377253a29f174bc63547f59ddb2025d35a72faeee7f1e9ee3c57f2411242df1c46c5d07d3a8b5211cf9b7
diff --git a/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
deleted file mode 100644
index 1f442afc3fdd..000000000000
--- a/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Disable failing tests for bug #630916.
-
---- lnav-0.8.3/test/Makefile.am
-+++ lnav-0.8.3/test/Makefile.am
-@@ -374,7 +374,6 @@
- 	test_concise \
- 	test_line_buffer2 \
- 	test_line_buffer.sh \
--	test_listview.sh \
- 	test_grep_proc.sh \
- 	test_grep_proc2 \
- 	test_hist_source \
-@@ -388,18 +387,15 @@
- 	test_scripts.sh \
- 	test_sessions.sh \
- 	test_shlexer.sh \
--	test_sql.sh \
- 	test_sql_coll_func.sh \
- 	test_sql_json_func.sh \
- 	test_sql_fs_func.sh \
- 	test_sql_str_func.sh \
- 	test_sql_time_func.sh \
--	test_view_colors.sh \
- 	test_vt52_curses.sh \
- 	test_top_status \
- 	test_data_parser.sh \
--	test_yajlpp \
--	test_pretty_print.sh
-+	test_yajlpp
- 
- if HAVE_LIBCURL
- TESTS += \
diff --git a/app-admin/lnav/lnav-0.8.3.ebuild b/app-admin/lnav/lnav-0.8.3.ebuild
deleted file mode 100644
index 4cc902a0eb99..000000000000
--- a/app-admin/lnav/lnav-0.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="http://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/libpcre[cxx]
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0=
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.8.4.ebuild b/app-admin/lnav/lnav-0.8.4.ebuild
deleted file mode 100644
index 0d788cfb2991..000000000000
--- a/app-admin/lnav/lnav-0.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="http://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-db/sqlite:3
-	dev-libs/libpcre[cxx]
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.8.5.ebuild b/app-admin/lnav/lnav-0.8.5.ebuild
index 37f65085a57e..8a803a78428e 100644
--- a/app-admin/lnav/lnav-0.8.5.ebuild
+++ b/app-admin/lnav/lnav-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs autotools
 
 DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="http://lnav.org"
+HOMEPAGE="https://lnav.org"
 SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index e4721812d400..7918a9929ec5 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -8,6 +8,6 @@ EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8d
 EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
 EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
-EBUILD mongo-tools-4.0.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.2.0.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.12.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.12.ebuild
index 092d770686fb..11f797e129c7 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.12.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 0a0842421083..e9342ccae9e9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,6 @@
-DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
-DIST sudo-1.8.28b3.tar.gz 3305122 BLAKE2B b3b9a3fbf853cfb484516eae3398c09c897115e887a7693014c304ff4b4a477861dbdf5af85b954054abeed7afa8b77470a4bad5e3beaf278b70c0969b6c6471 SHA512 87c16bd44bfabddbf8e0b9899d02ae05fbc1ccae9a21eb8123162f4a3dd4ccd91d013db5a50a6c249d85a3e1b4ac790c7dc0aabfe155f125dc211159404816ca
-EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
+DIST sudo-1.8.28rc1.tar.gz 3312316 BLAKE2B 051111a9a39333aef2c9a5afcb893b08656400bed42687370ba1d6ef1a60b8bbb3d3c8457a8150eaeed6a838de5f3d657f12ecdcad9881a5b9a5228fbeb2adee SHA512 03ab9fe009808f5b46bdee1f30b9c1a2bc94b7f342e573afa06089935c3a8f844f1ee3579b0b243a7195caf65502ac576b2b1629d9484ec1c54b9567478f6f42
 EBUILD sudo-1.8.27-r1.ebuild 6662 BLAKE2B 90eb9b9a0bd6de53d6bfb2ca9fd754225e50267c2e36038728dd9c7f716c0a16d9de67a3c44b5c1f719844967e2867c4b32a46d82db3a43ea5e2d8273b9466b9 SHA512 1c662e3e02c77f54001b3e59a1a68a4fc6726176e07aeec06d5b587e19550e288e36eb5b35033ef785af5ec881800e7c8ec98fb7e22cc96c25ad67ecb31b84fe
-EBUILD sudo-1.8.28_beta3.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
+EBUILD sudo-1.8.28_rc1.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
 EBUILD sudo-9999.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
-MISC metadata.xml 1489 BLAKE2B 3739b522115082830f82f509804b6f6f5e3ad55633c20b51b1cfa48960af6189bd33dd71d1e9432d4adf7bb4ad7790d7eed62996ab5ad12aa55732eee85b50a0 SHA512 6fa51671c5fa3ca442da0982542a8290ed39c835106c40d2db278ae16ec45eed28e563e203c1d5519bbf637483d0779094bca2ec3505d6f466d0a2b62b5248f8
+MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 8e31d55ef942..72faa0680c32 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="gcrypt">Use message digest functions from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's</flag>
 		<flag name="libressl">Use message digest functions from <pkg>dev-libs/libressl</pkg> instead of sudo's</flag>
 		<flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
-		<flag name="openssl">Use message digest functions from <pkg>dev-libs/openssl</pkg> instead of sudo's</flag>
 		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
 		<flag name="sssd">Add System Security Services Daemon support</flag>
 		<flag name="secure-path">Replace PATH variable with compile time secure paths</flag>
diff --git a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
deleted file mode 100644
index 284b319e05fc..000000000000
--- a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pam multilib libtool tmpfiles
-if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-	inherit mercurial
-fi
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} != "9999" ]] ; then
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey sssd"
-
-CDEPEND="
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
-	)
-	openssl? ( dev-libs/openssl:0= )
-	pam? ( virtual/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${CDEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-	?? ( gcrypt openssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		--enable-zlib=system
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-secure-path="${SECURE_PATH}"
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable openssl)
-		$(use_enable sasl)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with skey)
-		$(use_with sssd)
-		$(use_with selinux)
-		$(use_with sendmail)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED%/}"/run
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.8.28_beta3.ebuild b/app-admin/sudo/sudo-1.8.28_rc1.ebuild
index 69778e4b8d41..69778e4b8d41 100644
--- a/app-admin/sudo/sudo-1.8.28_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_rc1.ebuild