Sync with portage [Mon May 11 18:21:34 MSK 2020].

2020-05-11 18:21:34 +03:00 · 2020-05-11 18:21:34 +03:00 · 3e8090ed55
commit 3e8090ed55
parent ac0d956707
2683 changed files with 13483 additions and 12009 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29436 BLAKE2B c584d80709cb9b663fee4c6602b058ce3bcbb76e64cde7ae8cefde03c2fa85642cee8c0b17292093fef097d75e22657ede57320254e62fc773c9aa7a978bc5ac SHA512 3781bea75499de71e4dacb84c3c94d8f09c91f03f44a141bba0c1cc43b148b1921b60e4db93b776693ea1354f057c7a31deb14f879c81afe6e49acba86f9f5fd
-TIMESTAMP 2020-05-09T17:38:20Z
+MANIFEST Manifest.files.gz 29435 BLAKE2B 39b8149485aba926848ddb1d7ffb5be0be7dc035174351e213b1f581b23be4009ed8b0813aa7c1e83889b70d685c76ff1c745b937a88355cfd9bc600417de533 SHA512 ef231ba25d7c0e59620a2d396cd3d2b5371b8f305a536c87d791d887d29efebcd87a094c4b464acf403958b586ce7cf61f0191f978b10efb1a3acbb8686641be
+TIMESTAMP 2020-05-11T14:38:21Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl626oxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl65Y11fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAyAw//TI8nlHseJprlMMqUQmVtVGWjeQ85Tka/Jnl4zGEyE1/NYJW168ejvxUQ
-LdIgjwUkqSCLJZJPqKlRhkuzcWGWcoBh2W/yuokZikW/v1DMmEiXRaSwg69MzkI3
-yJdfHBrt8eURX/WX9oaSTczPhzAjLq3OCibwYeGFkkn92Gtpi+U5GE0N8D1bFgnI
-0YHkI4Ljo2t7FMJkbsNmbuvuwPPB88Y1krWMH4o/nh9p54kxRqq9bRUyJV2+lDHc
-TGXfiFF90iJWwJ4LM3HkH+4A8eItUZnzMt8LF1uut/MgJU3rFkX3fJHM8poQvPh2
-qaFn/IzHHUiwMhkF76l9WqbYhzbquCzqzdeE2gu9+syiA/EdFcoxiGvXRJz+UlYQ
-lZCO4Li0st5A9Y2I2+xRmrFm3wgtfswOzGjqRsCYZnrP97P7XEsZmYiXfdv+TyNG
-wFNmPkdB6pb1aUliZVNj32VJRe8FKJ8PKzVLph9P3YsvRJPbzkuuWbDWXhPQEX2X
-NXztYa4fFLuPS6Ome+wxQXLAE4pVh9CLb2uOJzyVn8uMTVlPJVvGBeutOwY+TXsc
-byJuYuuJECrGz/U32OS5Sr97TRRVT5pyMq2Pc6jwrjXzuD++2qNFJGsRVHr605rR
-FLeJyIvGkHmACy3bBIeEKKNsfr7MX5Fa+enQVejAGInngss8MPc=
-=Cbv2
+klBvWg/9HB5lEMjWBYh/eJY4J9p43xW2wBJ3qw7FekDuZZmuYOG9h6J8G0eypfnZ
+PkelpTKNwUD4ICIkHxE2m0zu/0y1tQ0mKh2Ws12L541jPaDhqcO8CMAE2cEhTD+e
+gXgIXgsWRzSUqNs6KfhJlOpHHVQcd4Htkr9wVq1zR/t8QMpnHqWN3Ljatp/tHtDz
+gAHSJr1HEhWzcc2AX4OtRIfIo9bi2kBuau56En9n6N+n+72ZO5J5ErXdRgoiTXER
+mB4AE0fVFYqnaP9k74eSvJgqjjB/SDb59vMpFkXczRVc7RV6THLeG2KD33jjb+Zo
+RyJmwFtgPQte5kDWyOIyEwp0vadBm/Gk3wKLC9bbf5FZmOezxj6HC4YwscCTHJvh
+iqsjiMnpz5T4QydFGr2FenNE9iJWt1yOc8x6UTQCNHcaBpPTY6BExMLeSrr5SjR2
+jlyrodBaMriezJ2XURl+aE/PeBaqeJSMBSUfBERRcY0Qsk4LNVSmDlAT9FdnDl8m
+gQc3AXyHyMu1mnkoa9iua+64UOZK2avNW21qbIGv30i6ESVLFwy3lDCUd770jkJ4
+puTXePRqKz7uP2likI5OANp2IDSxXD57XccXuE/CvgoEeerlnJD9R8TNcuwgwjNS
+9mGf3aBEdsymaKu/J/JPF7JzligIp5oq9qgVXyfTlTMp36fzHh4=
+=TJ2H
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/spamd/Manifest
+++ b/acct-group/spamd/Manifest
@ -0,0 +1,2 @@
+EBUILD spamd-0.ebuild 199 BLAKE2B 0093025869e6c67b61727b0eb7019227598de142f0e1fa21bf51c86acea15f2abecdf2816f392d9dfe4aa10ba06b65345890c24013a478ca3161561e2338de36 SHA512 03532b212f3dc3058e811df44c45e69adce3753beaf40ac96281aa2879105bf18b855f2bc3659d509c2e4ff3bb56f24d8f8900696f897306c2afbc45e6b54e80
+MISC metadata.xml 400 BLAKE2B c742063222091176da4498b768820a52a0fb382f5c7f4ebe98660c0de5c47850b17bd5aaaf35d0ce17ceba44a0e62050366686c081929dc8c624f7d5709c717b SHA512 415a2cc228c2b71cc55a9a6d6dfb413ed1bdd5c559a37406d15c6ffb0f212ea0a04aeb4c029ac62306c8fdd363d5d950d83033e2ef427bcedafa80e31363ab30
--- a/acct-group/spamd/metadata.xml
+++ b/acct-group/spamd/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo_bugs_peep@parallaxshift.com</email>
+    <name>Philippe Chaintreuil</name>
+  </maintainer>
+
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
--- a/acct-group/spamd/spamd-0.ebuild
+++ b/acct-group/spamd/spamd-0.ebuild
@ -0,0 +1,9 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the SpamAssassin daemon"
+ACCT_GROUP_ID=337
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/spamd/Manifest
+++ b/acct-user/spamd/Manifest
@ -0,0 +1,2 @@
+EBUILD spamd-0.ebuild 731 BLAKE2B 0f219605b86301fdd33a1cf0d4a2d45d3f97167de46b1cebaa45c010a1b4faabd42e92b69ef3d39c83bff145889fa6a6abdd66aec236c91758911ce57e4bf5e3 SHA512 ed22f0112627def013342d1998f5580220cd078dd03dcee6801c332dabfda17680176ae9ca9e0ee1e950f3aac897b3a364bc04f6c097a8e9598610972d66e3d3
+MISC metadata.xml 400 BLAKE2B c742063222091176da4498b768820a52a0fb382f5c7f4ebe98660c0de5c47850b17bd5aaaf35d0ce17ceba44a0e62050366686c081929dc8c624f7d5709c717b SHA512 415a2cc228c2b71cc55a9a6d6dfb413ed1bdd5c559a37406d15c6ffb0f212ea0a04aeb4c029ac62306c8fdd363d5d950d83033e2ef427bcedafa80e31363ab30
--- a/acct-user/spamd/metadata.xml
+++ b/acct-user/spamd/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo_bugs_peep@parallaxshift.com</email>
+    <name>Philippe Chaintreuil</name>
+  </maintainer>
+
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
--- a/acct-user/spamd/spamd-0.ebuild
+++ b/acct-user/spamd/spamd-0.ebuild
@ -0,0 +1,25 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SpamAssassin daemon"
+
+ACCT_USER_ID=337
+ACCT_USER_GROUPS=( "${PN}" )
+# The spamd daemon runs as this user. Use a real home directory so
+# that it can hold SA configuration.
+#
+# Since spamd's home contains user-modifiable config files, it's
+# a violation of the Linux FHS for it to be here, but it's been
+# decided it can't be in /home/.
+#
+# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
+# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
+#
+ACCT_USER_HOME="/var/lib/spamd"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
--- a/acct-user/tvheadend/Manifest
+++ b/acct-user/tvheadend/Manifest
@ -0,0 +1,2 @@
+EBUILD tvheadend-0.ebuild 284 BLAKE2B ba491eab275ce324a7d89f7c8397c03cf9110ad43fbf03bb65b9bb72739925f39320941f2d9efc46e45826f0f4f378c249cdab3aa12f270cf2fd3f4543f002f5 SHA512 f214a3cc4eafee1d4749713d225541df2b85c75b791ddebda9c71ac4fb416e94d27d8ff692dcaedf5628752a6975f016b02954b7c175afb359a1b694a7301c99
+MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
--- a/acct-user/tvheadend/metadata.xml
+++ b/acct-user/tvheadend/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/tvheadend/tvheadend-0.ebuild
+++ b/acct-user/tvheadend/tvheadend-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for tvheadend"
+ACCT_USER_ID=462
+ACCT_USER_GROUPS=( video )
+ACCT_USER_HOME=/var/lib/tvheadend
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@ -34,6 +34,7 @@ DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
 DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
 DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip 13502 BLAKE2B 8423a01877ac7ebe40452e5e84551dc9e00a818051d5bcd5d0daa84a55939caaf2ecc130749d4664af62845820e429b8313559c6a78d79f83ad3728d17d9669d SHA512 893ecce9d3eff9ad6e845778a5499a5fa1c723afdcc4be16b323773cff61fe216624b1aeae62ef8c731edb68cfcc099a81297b261451496fe133156c6df133cd
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
@ -46,6 +47,12 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
+DIST github.com%2Fgoogle%2Fgo-github%2Fv31%2F@v%2Fv31.0.0.mod 362 BLAKE2B 66fd257666d0d7445f79d6aeaf7c31768b4b8f9392b9b30c498d261dbc87c08b48456e3fffd7aada41720eff4ad51e5c9cd6186fdc1ef573c4c5fd71fd7e80d3 SHA512 865ae58366e25fedc575873957948850cdb37bc96d2628c6e4f2137b1d4ac61daf98d03b065eb45eb7006a9e8df11ca851880da112baac124aec859720c0bcd2
+DIST github.com%2Fgoogle%2Fgo-github%2Fv31%2F@v%2Fv31.0.0.zip 436062 BLAKE2B 5d33498a4a42ac99b348d1886ca23941b7b47551c2effb5fe8a78ce93fd42a12f6d3863cc457b03e94b2239a71ed6325b76dc4512d00cde3d2d00ed562bb94a1 SHA512 c4c791528941b0a0a5f24a355e6d26e74595b34a28111f37f84ba5d4265be5ad4809806cd2540941e97bc5c398825e73cde44d039aff6268dc529f9237109c9c
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
@ -115,9 +122,11 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip 1500505 BLAKE2B aed582fa92d06c76e5c250a9eaf7645b4147d384422e263ecff6136b660dd2af8a40cdf539b9966059e754301afed01b3fcf59d2680ed88bc438d6297a44d7b3 SHA512 7cfa0dc01fa55ff83d10087ddc6358e2e7021d1a8a27393f5778607cf3dfe0c31363676e1663ab4ee485273e580d6f92a486ea62d5944892104f13cac5080b82
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@ -134,6 +143,7 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@ -141,7 +151,7 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
 DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
-DIST gopass-1.9.0.tar.gz 406187 BLAKE2B 0764ec3d28e1ae2e1c4e8568db903edb93d8c612295b3ae0a06a7a987b11aa0961e50ba4eafce6495872786f57e35a7dbe4cf8fbb3d73550bbe1f29ba47b16f5 SHA512 5f0dbc42bcdbb5acdb36806b24cc607115eb403e3ca5268818590dccf23e62f5337e570b77c5fadd42e9b508fb419b51603a6cb6bb4abe6d9fa334c9710d61ca
+DIST gopass-1.9.1.tar.gz 418562 BLAKE2B 9db44fcffd8728763364dfbb508565aa30b6b31ab930d65cc8cf9adcde9c26a6dbca5232c6027eac0316e78957f3fa0f5a10f75d24801b6faec283ab51b67a22 SHA512 a70affc278b5d46582a3362c28f1aff8be4481aae3d07f3b7e200117fc2ac79466c475d558fe5a642b0102a46fc95242334f406deca6ee4abd7d5e9f674451ab
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
@ -152,5 +162,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
 EBUILD gopass-1.8.6-r1.ebuild 1068 BLAKE2B 11cfbbeb943ad9ed42bd9e16ff230d49ff40759e241d6a60ccf57b31a4bf455dfb4ff954e31fbfcf06ce242e5776ddff100b604448eed80986bd63c472680fdc SHA512 f9a71715b209b88157c72591a30f3d385f14d6e3456324a75cdcfc1e9e9e9f795f65482f7b3ec45b9691af88d756fd71646a4bf7e0c4855415843663d9c1e78a
-EBUILD gopass-1.9.0.ebuild 8707 BLAKE2B 35055c1e3a916f98af282de33a21023924cf320d9a03b61720ea2856d874ae3aa20965553873fd969a8d47a40f40336e78b2bd4209846213f2566d3085bf3d5d SHA512 0b77b9348f32ad1579168070c2c16083fe4600b87b6e1d3f90cba74286af86e0bb26a0924e9bdba1da05603d6718ef76991c8e1ebc35b821d397ed2d7a673f89
+EBUILD gopass-1.9.1.ebuild 9220 BLAKE2B 4108a361a430f00d8eb80b17fd387688c32c7873ce765bfe09b1d4aa09ef4f0c6171a2898072ef56b2e178d02e442901e465111ac6708488f10b4104cb60e6e1 SHA512 68536d8b90fa584227e7a75981fe0b4f66ca85e5c901b3f0dd4be21bf37e21bfeacfaa93c0523210678400f008fd7c6e464c37d244a79e4b72ba66c6e517036f
 MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
--- a/app-admin/gopass/gopass-1.9.1.ebuild
+++ b/app-admin/gopass/gopass-1.9.1.ebuild
@ -42,6 +42,7 @@ EGO_SUM=(
 	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
 	"github.com/gokyle/twofactor v1.0.1"
 	"github.com/gokyle/twofactor v1.0.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
 	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
 	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
 	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
@ -54,6 +55,12 @@ EGO_SUM=(
 	"github.com/google/go-cmp v0.3.1/go.mod"
 	"github.com/google/go-cmp v0.4.0"
 	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-github/v31 v31.0.0"
+	"github.com/google/go-github/v31 v31.0.0/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
 	"github.com/hashicorp/errwrap v1.0.0"
 	"github.com/hashicorp/errwrap v1.0.0/go.mod"
 	"github.com/hashicorp/go-multierror v1.1.0"
@ -123,9 +130,11 @@ EGO_SUM=(
 	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
 	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
 	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
 	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd"
 	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
@ -142,6 +151,7 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
 	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
 	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
 	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@ -1,5 +1,7 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
 DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
+DIST KeePass-2.45-Source.zip 5011684 BLAKE2B cf7fafb2666f2e0005533e441f1855006aa64aca69b4829fa66117da88f92e6aa65d58b303a099221e796a500bc5abab5c3d0654e6fa53c3fe6f36d3cb18e381 SHA512 3f9b14e57fce047f8d8ae7c289fffd954545c5638fa20392e7864301073452a4353f487832730fb600e1729b1333360c1bce7e66fc8629788e666418a2afbf9a
 EBUILD keepass-2.44.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
+EBUILD keepass-2.45.ebuild 3230 BLAKE2B 9e3c55cb5220c18d7044de21d21cd96a1ad5f145ecf627d1db444ed5a187bc97aad27332c1e7a841c8153ae86eec2dc50f48a00567e681714b3354fc81b1c965 SHA512 b1c53ec9a3f97156823bb6c9265f0fa89b7c000a943557dfe3ba5a19eeec36657d537340692eeaccbf61b3af8508785b78cc0615595775b1e9074a285d53605a
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
--- a/app-admin/keepass/keepass-2.45.ebuild
+++ b/app-admin/keepass/keepass-2.45.ebuild
@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+# bug #687052
+# file generated by mono --aot where *FLAGS don't make sense
+QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	pushd Build || die
+	source PrepMonoDev.sh || die
+	popd || die
+}
+
+src_compile() {
+	export MONO_REGISTRY_PATH=/dev/null # bug 659808
+
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,8 +1,8 @@
 DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a
 DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc
-DIST sudo-1.9.0rc4.tar.gz 3744357 BLAKE2B 569b2e94cbe837d9d2418a6ef7e53484975821d0a3cd0281473b96ee44939c65d8cd9ffc43a00170a6bbc1001cf1e0b826768ada13b3c4c4b85c7c0366b14eda SHA512 e3925f9e0e5eaf426ab4629c772ad36ea97298064bebdf038a82b4db5a73e9191733c0c6d88c6a2aa1f5c8c6d1a0e17b67d8b97e3e384b7f0894be5ac7276e01
+DIST sudo-1.9.0rc5.tar.gz 3746417 BLAKE2B 35c6fdca69e28d6ca3a689a8772995d95842e34d0d2c76423699c163c0afb24f884b03e05c64a4f3cf66bf9631fc28f7933fe63006959a801c375d8238c8489c SHA512 9ae0f3c3d793e6b1f91cea13ec4d4d6058335f15399956c5eaf1093044eb565d1e04581678b8b7699e3f517086be1efadf1ef0454666656fb38d0f5de8645454
 EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc
 EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
-EBUILD sudo-1.9.0_rc4.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
+EBUILD sudo-1.9.0_rc5.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
 EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
--- a/app-admin/sudo/sudo-1.9.0_rc5.ebuild
+++ b/app-admin/sudo/sudo-1.9.0_rc5.ebuild
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@ -4,5 +4,5 @@ DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e57
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
 EBUILD zstd-1.3.7-r1.ebuild 1345 BLAKE2B 3ed2bbdb0f63e57dbbebf91b38c460a7646adfc42a34f40e26728c9aa2fc80f60238efc4df4867927f4c15dc221ab35bc14fee523680980aa6d8e3c60f174828 SHA512 45ae51d8608941336dfff2e0d1e71a7c13de645a3f3012f63d43e980c72c82ade46f233528baf784cda5eeb0899617bf77c1caabcd22c2a522a16da75eef9ef1
 EBUILD zstd-1.4.4-r3.ebuild 1558 BLAKE2B e60061922b9e01df894bf199cc7a0ddb8b999f7d44c84b3db332548d8732c32c948afa4301ae3383a59949a8f23ab7e83972b4eebdeb760ec14b86b2c8868d2f SHA512 1a862c0d9a7c4c8e04ee3c98e5ffba5ae85bf66163016c7d2a7332191e3bdf41444c194cc5bb08a6935fff890a3683a7881ec88f49c624e399580e920814e8e0
-EBUILD zstd-1.4.4-r4.ebuild 1778 BLAKE2B e9f0be2283c07a3ee02bcfa5cd0ec48f14d7d37b2e32bb5ec57c97bfa4c9d224a0e5008f6b4e4f897db44962cb303e6fab90160711c000b8a025adcb12df5e5e SHA512 e1fcb61edc7f9e307b013631fad28a4fd475f26a2fb6a2d8b876efd0fedfd6ca9f5472f5088315bab15e77b859c3aae07f8a092352726f651d73ae82b6efe551
+EBUILD zstd-1.4.4-r4.ebuild 1785 BLAKE2B 3ecdc81d9ca6905ab87308aba86488f03b723d98062120bc8049a2a4cc16958dfda368a57f15c93e16d720816b3dde9c11e6662eb5131c828eeb87591d901141 SHA512 d80f766db89d7ad70847557e49d13c597170207045a76506212b78fccf5a8e205477db57c7f5c8eb28f10b25fd5b0a36745a889ee467af50d633e003a21c7bb1
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
--- a/app-arch/zstd/zstd-1.4.4-r4.ebuild
+++ b/app-arch/zstd/zstd-1.4.4-r4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"

 RDEPEND="app-arch/xz-utils
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/hey/Manifest
+++ b/app-benchmarks/hey/Manifest
@ -1,5 +1,3 @@
-DIST hey-0.1.1_p20181017.tar.gz 446212 BLAKE2B b8d55e4f7efb34634b81b5301617c84aea66cb1fdbe973d45317a309b845d4503331618688feeaef2bb9effa82f6d155b68b813a4b5b4f17149245cb7f15b2ec SHA512 ccaf4ca2025ce4cbe10cbeb5d7a43903d7e15fdc20ed9623795bd3c11b0df510c3b51749c5e63502fb0fd3153f18a7d1b65297b11631b5889f719d0619602604
 DIST hey-0.1.2.tar.gz 446073 BLAKE2B 5c5933f54f5895100ea0f5b08c84143d30fb02f1b2a5cf1209a41b271d18dbf41ce24bf35fdc9846d04173e620e584e1afd8f0b3e8e7a9cd8d6d8e2aa85fac67 SHA512 21b7b2ddee84c2dd144a7bca44ea2c24dcfe5a6e41f8ad388a1099ec42b83789748906c2d405b774aefbdffd5cb90e045219f6ee39a9837adef5b57c5f0b2e3a
-EBUILD hey-0.1.1_p20181017.ebuild 831 BLAKE2B 77d094913d5a8ed91c7e0191e87463222cab5de4a68d781f30420fd9ef8eeb05bdf1f6b4b2e6f8c1f69ea2c0dd9f1808e751c18a779c651e889726a9b0ce52b9 SHA512 d305e90d1ec1beabf22b3c43f3067f7c78f9a8a1d71588b8389b5ceff4af54c423869cf9a96d0e4fc48b49a891c7210fa6bd447ced9d7aa0c822a626a5a85679
-EBUILD hey-0.1.2.ebuild 582 BLAKE2B a008d953e6974ccc916f3fa4ffb5814435fc8154f34f2df605490c44d93129553918fdfb00449fa6c22a8c35d2aea7de228ab5b9bc3ac9d34e37fa9a7c0ae7d9 SHA512 735ae5ad2beeeef9d8590ded52f07cda6c9910c3b87417fc1f9b95941b19ef10b6a62a5ef7185c5c797f255751a655e4c96ca383d5c51cc5bc777deb461da807
+EBUILD hey-0.1.2.ebuild 600 BLAKE2B 6cf927ecd92a087cd618a862c55bb9528171768cdbc6c02a3b8f2488dbef27435a53cd94765dec1bdc76089e7e14edcfc7da745a8796c273d1ae335fa705682b SHA512 a8a90425be7bc8d21fb27ee6fa88216cbfbc964cb06bb512d9bc4ba7d78f67b17c0eed139d7cb45044ea45735cdcce9de76eb4b6eb6b6319d330303a3c523cac
 MISC metadata.xml 293 BLAKE2B 02d2186b0c437f4e4b8627c62859ab58035c8084a9150562f92a54374b55a091984a25573b2d7baf0ab21319556452a80f572b3c62d895c5cb9cd0bfa9763f2a SHA512 523be217cb99d6caa758df2bd2a13f8aec17c19e1e58053fc70d4d598bdff4292b1c98555c3e69a319687981bd128aec5961558e40c771f55e3082c5ed13ea75
--- a/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
+++ b/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_SRC="github.com/rakyll/hey"
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="01803349acd49d756dafa2cb6ac5b5bfc141fc3b"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="HTTP load generator, ApacheBench (ab) replacement, formerly known as rakyll/boom"
-HOMEPAGE="https://github.com/rakyll/hey"
-SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_SRC}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" GO111MODULE=on \
-		go install -mod=vendor -v -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin "${WORKDIR}/${P}/bin"/*
-	dodoc README.md
-}
--- a/app-benchmarks/hey/hey-0.1.2.ebuild
+++ b/app-benchmarks/hey/hey-0.1.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -18,7 +18,7 @@ RDEPEND=""

 src_compile() {
 	export -n GOCACHE XDG_CACHE_HOME
-	go build -o ./bin/${PN} || die
+	go build -v -x -mod=vendor -o ./bin/${PN} || die
 }

 src_install() {
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@ -1,4 +1,4 @@
 AUX wrk-4.1.0-r1-makefile.patch 963 BLAKE2B de7fea198e9e9366f763d2c0d25d1ff5ee2d91791eb7404ac19ceb75dd7f80f0ded3b3c97708c0b23105a42bd47f4750f1337ab8046a095e57ef0ec67d7bf9a6 SHA512 3dbdc1cc3bd74131ac91a211bf6e46754feac5f73b93d64f04f53e7e3acf285f349a8d21a6744b443aa9533d619073729187fe26a97faa03bafa6d99543c5dab
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-4.1.0-r1.ebuild 877 BLAKE2B 615984bbe2a7f24f039d2723e8b740ccd2360e73c0a8e5b254caa3859cf700808c72a54c7c0039db221f14594de488b8afc1da51973ac03248e5f670cc38084a SHA512 bd2e1ba2b64fb279a54d44b61f12b3f5a07b9b4bf5c78ddbdeff3692d84caeda745e56705387732bc9e9cb66467a4c245e632ab3e7160407660c97fb02f3f71c
+EBUILD wrk-4.1.0-r2.ebuild 915 BLAKE2B f9ca7c5a90d171154de70c1c8899a3548ea763604527741ee35af53c87a29c8cc626e84df84d7a912681b865df695dfe8deb0e8ad9972ad19c9653f4c507c4a6 SHA512 2e112f88ec54cf24de6a07d4dbc3a544f45d350b1fa35fd6f917952dd34630f49619269f34601e84a3b51d3929a41419089ba112d797ca9b113e76cf0168aba7
 MISC metadata.xml 753 BLAKE2B 394af58d15030f33d953c4afae440cad777ba3e5fb4f95ec4a06cc6124929365bbcb2117734e7bb6e3d45cf9a42acee152a556f280fcf04244c0d8103e8f161f SHA512 5e262656536bd745faca708024430a5fc321dfea12ab61fdf74bae90df9b1d8237737db5a09afffdbfa278e29a9eb250292c2023263e4540f3fdd4cfe4984ade
--- a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -14,15 +14,23 @@ LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE="libressl"

-RDEPEND="
+CBUILD="dev-lang/luajit:2"
+
+DEPEND="
 	dev-lang/lua:0
-	dev-lang/luajit:2
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
 "

-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	${CBUILD}
+	${RDEPEND}
+"
+
+BDEPEND="
+	${CBUILD}
+	virtual/pkgconfig
+"

 DOCS=(
 	"CHANGES"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@ -1,10 +1,4 @@
 AUX cfssl-1.4.1-build-fix.patch 587 BLAKE2B 74651f5b21947cab2a004e25ca4b30cc6f33a7a5a7089c7d25929d0792f497139268c51ab3f1054dfdba0db073b2f57c0e1807f50b3278527611d17c4942951f SHA512 606d410d70f9b457fe83f2933bb0f335256ddbb1898911984a220da2ed635b732f5a04ad4902de42913aa987793165974117855a6b19857853478d9e7394fa9b
-DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
-DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
-DIST cfssl-1.3.4.tar.gz 7092440 BLAKE2B 85a7a73ae5b18ae0e4ac02b1a4d5f633d73f2c0f81cb49ef85c39b6a241ac538220a8cebb448af795140a6308f46f6e53003f25a31edad452cb6db39ff95a9b2 SHA512 796f24f9a7cd9966b3586b5b08deb410570cc31ec747b0c834215c105df1b4fea4907bfa223d196ad71fb296724dc690b6ffd298c8ef81db1333ed3e69f1ecd4
 DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
-EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
-EBUILD cfssl-1.3.3.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
-EBUILD cfssl-1.3.4.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
 EBUILD cfssl-1.4.1.ebuild 647 BLAKE2B dd609e6e27897765ad3fd1bbfe55362f484e633a5779a38f3d802b40406ece3ec343e0a1c76fdf75bdec144504b9046d582b2341605dfb12314a30cf4ee51152 SHA512 f13adc0c6c0274309b37ad504bf641483ae905173224a746bc6f045ebad138c21c294bd6707cb4e42f2ed6efcd1bacbf60d082e83a91daf357ec37b6bca9a2a5
 MISC metadata.xml 329 BLAKE2B 5188aa700150b22b0d2972d57ee0db2d1a2239017edbf9547961126b7158060c74aaafd1ffedfa25f76402766a4403d41f3875a8bd2c43d84150177879e35186 SHA512 b56f2d72ad1a5ef0c2531cc1d3524bf13f7089d099bbd774d1774aca5dfb7f8c074b945203ccb80672c154f98d8728cf9d8671e7df9b328c01c2e79cb9ba8be5
--- a/app-crypt/cfssl/cfssl-1.3.2.ebuild
+++ b/app-crypt/cfssl/cfssl-1.3.2.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc CHANGELOG README.md
-	popd || die
-}
--- a/app-crypt/cfssl/cfssl-1.3.3.ebuild
+++ b/app-crypt/cfssl/cfssl-1.3.3.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc CHANGELOG README.md
-	popd || die
-}
--- a/app-crypt/cfssl/cfssl-1.3.4.ebuild
+++ b/app-crypt/cfssl/cfssl-1.3.4.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc CHANGELOG README.md
-	popd || die
-}
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@ -1,8 +1,4 @@
-AUX ophcrack-openssl-des.patch 3253 BLAKE2B 91bdac930a784eb8f68c9cfbec7f0a41e05356cc5a87b2db37669e943fc576938b3cc494446d78407555d56af4357a77e4d92f391a4ec5971b5ae97ccd36a0db SHA512 60f4ec2792f1d697db62bbef16a1f365e368fa4cf99695b1fdda4cdfaa1fdef04bf39dbfea72fe5d97aead6435553051eda0b3b619ae93915f11b87de29cc4bc
-DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
-DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
+AUX ophcrack-ar.patch 242 BLAKE2B f268c2a0c0900c3ea6a3e4fc1c99530a090e413fbba9e4ff7c339ae6b5db49ad546eb58cd42a64f81d669c38ed9a4de25cfcfb29ee17af1c88b4372aee4fda51 SHA512 bb4f8154abe676ccec48536b50513b45253828334db040f28fe71e5b9d3d7abb6b34693ec234f10ce8c26592d07ccdd678a68b96b6a80ca9137c18a9e0598bfc
 DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
-EBUILD ophcrack-3.6.0.ebuild 789 BLAKE2B 2b669ff146298dc6c004511384b7b462a79f587f9f18a17baa1500ba333ef2567b014bb5d2eb92a05a99711231a22375d0062455f61dc7fd10cbcaf8b9388ab4 SHA512 f4d7f623523eed36281a0a95915680a504bab50fb866e9f1b1edee414055e6c44fe630dee9b077f6c242520353019cd141a5170fa862f769378256208d0c11c9
-EBUILD ophcrack-3.7.0.ebuild 739 BLAKE2B 9019a62a463c8f1bbdb7f3d5d90d1d130cfc79c09a87a3a86d4722c6788561cd67ec32f9dbafc08064e2dbfeb2935b63fa3c3ce18d5b7f60f46f0b937d9ef305 SHA512 3f684df8eab1422442e1665cebe987d0d5949d44f55c549930e21a4d585511f070d65fe5552f64ec77ee8a8f7fd4422cc1dd6c62dc5dd1b7de8a56e913f3c219
-EBUILD ophcrack-3.8.0.ebuild 907 BLAKE2B be3aa07cd0440d11d4583f7734d12d875a849b041e7cef419c346029cb128220dad093d31e01dd72cf3f3a652e5529c8ea996732bcc562e1d732d282ec3baf2f SHA512 e13997efd14e685f24040590e1dbbaf5a4a93b343801d852f269a9223d3f7209ee9a1bb40ab5e0649f921442f26fc7ca91687fa7d9dd796a7ddeb35d5a89071b
+EBUILD ophcrack-3.8.0.ebuild 939 BLAKE2B 437e2f298f7855b67748e9f0ecd82f901ad9eead6423f561ae83953b83065ba1b51bd13da7c994510295ce39aaf193bf3a51f1848cfd03278768bbd3eb281b22 SHA512 e91c9d5589133065b764d41d7701f4ba7b962071ba2da7dc81dc6f3e62b6c75bb61413f1f60e65d7ffc39065950cecef6b0319619cfd8203be9b52e34195f323
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
--- a/app-crypt/ophcrack/files/ophcrack-ar.patch
+++ b/app-crypt/ophcrack/files/ophcrack-ar.patch
@ -0,0 +1,13 @@
+diff --git a/src/common.mk.in b/src/common.mk.in
+index 0f090a8..9c133e0 100644
+--- a/src/common.mk.in
+++ b/src/common.mk.in
+@@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
+ all:
+ 
+ %.a:
+-	ar r $@ $^
+	$(AR) r $@ $^
+ 	$(RANLIB) $@
+ 
+ %.o: %.c
--- a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
+++ b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
@ -1,92 +0,0 @@
--- a/src/lmtable.c	2013-06-04 07:42:47 UTC
-+++ b/src/lmtable.c
-@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar
- /*-------------------------------------------------------------------------*/
- void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
-   uchar_t key[8];
-  des_key_schedule ks;
-  des_cblock *magic = (des_cblock*)lmmagic;
-+  DES_key_schedule ks;
-+  DES_cblock *magic = (DES_cblock*)lmmagic;
-   
-   key[0] = pwd[0];
-   key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
-@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_
-   key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
-   key[7] = (pwd[6] << 1) ;
- 
-  des_set_odd_parity(&key);
-  des_set_key(&key, ks);
-  des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
-+  DES_set_odd_parity(&key);
-+  DES_set_key(&key, &ks);
-+  DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
- }
-
--- a/src/samdump2/samdump2.c	2015-03-30 02:26:33 UTC
-+++ b/src/samdump2/samdump2.c
-@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig
- 	for (i=0;i<8;i++) {
- 		key[i] = (key[i]<<1);
- 	}
-	des_set_odd_parity((des_cblock *)key);
-+	DES_set_odd_parity((DES_cblock *)key);
- }
- 
- /*
-@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c
-   unsigned char hbootkey[0x20];
-   
-   /* Des */
-  des_key_schedule ks1, ks2;
-  des_cblock deskey1, deskey2;
-+  DES_key_schedule ks1, ks2;
-+  DES_cblock deskey1, deskey2;
-   
-   int i, j;
-   
-@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c
-       
-       /* Get the two decrpt keys. */
-       sid_to_key1(rid,(unsigned char *)deskey1);
-      des_set_key_checked((des_cblock *)deskey1,ks1);
-+      DES_set_key_checked((DES_cblock *)deskey1, &ks1);
-       sid_to_key2(rid,(unsigned char *)deskey2);
-      des_set_key_unchecked((des_cblock *)deskey2,ks2);
-+      DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
-       
-       /* Decrypt the lanman password hash as two 8 byte blocks. */
-      des_ecb_encrypt((des_cblock *)obfkey,
-		      (des_cblock *)fb, ks1, DES_DECRYPT);
-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)obfkey,
-+		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-       
-       
-       
-@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c
-       if (lm_size != 0x14) {
- 	/* Get the two decrpt keys. */
- 	sid_to_key1(rid,(unsigned char *)deskey1);
-	des_set_key((des_cblock *)deskey1,ks1);
-+	DES_set_key((DES_cblock *)deskey1, &ks1);
- 	sid_to_key2(rid,(unsigned char *)deskey2);
-	des_set_key((des_cblock *)deskey2,ks2);
-+	DES_set_key((DES_cblock *)deskey2, &ks2);
-       }
- 
-       /* Decrypt the NT md4 password hash as two 8 byte blocks. */
-      des_ecb_encrypt((des_cblock *)obfkey,
-		      (des_cblock *)fb, ks1, DES_DECRYPT);
-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)obfkey,
-+		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-       
-       /* sf27 wrap to sf25 */
-       //sf27( obfkey, (int*)&rid, fb );
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib"
-DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
-
-PATCHES="${FILESDIR}/ophcrack-openssl-des.patch"
-
-src_configure() {
-
-	local myconf
-
-	myconf="${myconf} $(use_enable debug) --disable-gui"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib"
-DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
-
-src_configure() {
-
-	local myconf
-
-	myconf="${myconf} $(use_enable debug) --disable-gui"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -14,15 +14,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug libressl qt5 +tables"

 CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib
-		 qt5? ( dev-qt/qtcharts:5
-		 dev-qt/qtgui:5 )"
+		libressl? ( dev-libs/libressl:0= )
+		net-libs/netwib
+		qt5? ( dev-qt/qtcharts:5
+		dev-qt/qtgui:5 )"
 DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
+		virtual/pkgconfig
+		${CDEPEND}"
 RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
+		${CDEPEND}"
+PATCHES=("${FILESDIR}/ophcrack-ar.patch")

 src_configure() {

--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@ -1,3 +1,3 @@
 DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
-EBUILD ssss-0.5.ebuild 755 BLAKE2B 99d90a6b0ebd25739c177d3b72a1ae62897674b3397393382b845f890c8b7a50dad81050accb76db95fcc7e1f4ac627e436f3c7835caf500d1858157ba118970 SHA512 4d42d16680eb2bc9a752e9574433f52c910902a66075979b6d9ff4fd27bbeb7ab18b3656ce38659359e27d1ef1d3e9bbfc70dff9abf9a305e1e07f1a60517cd2
+EBUILD ssss-0.5-r1.ebuild 774 BLAKE2B 08fa8b0d2c88ba22cb3a74bd728a32c2e54ff9cd92b88c8345e407b035bc2916f547ed18ab90d76efb401e6cd7aa015f0262bdb9b9629039091aef5c19725dd6 SHA512 364456d49bf4625c632e42dfee4013b84cb4dee6df747b113dcc11362c4bbb9cbbc2c5b460411986c751c4fd0a4c34a288464b383601bc2eb6c331ad295224f8
 MISC metadata.xml 496 BLAKE2B 0e998a8a5587315750394702193fa739a61bcc5101f38eca3b25f13af0661b54f76ad214fc0e378cc55a7a99192e3c7f75166eedda18ab61c1d9911830f40b6c SHA512 84249ac824f19a308cc20bde7610c829030c363c13c6111bfe30d7d5a219461728a8f6010bb006821be5ede4a2cf02c3e11eee67d782126ef0e1453207298c66
--- a/app-crypt/ssss/ssss-0.5-r1.ebuild
+++ b/app-crypt/ssss/ssss-0.5-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -25,8 +25,8 @@ src_prepare() {

 	tc-export CC

-	# Respect users CFLAGS and don't strip, as portage does this part.
-	sed -e 's/-O2/$(CFLAGS)/g' -e '/strip/d' -i Makefile || die
+	# Respect users [CL]FLAGS and don't strip, as portage does this part
+	sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -i Makefile || die
 }

 src_install() {
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@ -7,5 +7,5 @@ AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 EBUILD trousers-0.3.14-r1.ebuild 3005 BLAKE2B 625aca034e7f6c85660c31f2ea2aeea18dc9b555213c8238c54d1e348a1a46db01f6e852ab2ae26ac42d396ba928a75bc0ba9d898bbd74b69b4c0b66310bb604 SHA512 bcbd7d7925f0ad42365c73a0419effe6c2e0b63904b1d2730305251b4ed6c95e5d36b6266a1409714075af714055b4500895399cf0b59ec8baa7bbaffb773502
-EBUILD trousers-0.3.14-r2.ebuild 1584 BLAKE2B 83f09a6d466e4eb3bb0a20226a8306cca1f793c0079392bd1639f22f337aeeacf1460c88d382a684a5a80edb1aeb90148dc0e98b03ddf8bee1ce1bc0d73a248e SHA512 7e74633d4886d4ab0c57643a96968fc75d9987a0f0a89a81f4470be6e3ce00684a26fa2252d5041c1a2a91b405e03003eb7537fd24bb03e98ec4fe5139adec32
+EBUILD trousers-0.3.14-r2.ebuild 1581 BLAKE2B f5b8e109ad36fb16f85d080f724a5603c84701de7403218050dc7c2f3b02bfa01e934ea20880ccf435b95a769def21ae13c3dc8d1ae4bbbff1ca61163ca99b04 SHA512 82f0e4aba6a70164b77a51d1358c7ac872e68ddd1f3881b67b6c73d17ab2e6b288a4b724fe6a980b74c9a91a56b738f6bdce17a7a12e8cca9e63e059b255b470
 MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"

 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
 IUSE="doc libressl selinux" # gtk

 # gtk support presently does NOT compile.
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/aee/Manifest
+++ b/app-editors/aee/Manifest
@ -1,8 +1,6 @@
-AUX aee-2.2.15b-ae-location.patch 2656 BLAKE2B 249d858c5ca410b422d73f5932b13cc9a9ea007e1099e6a8e9f81e7f8a0ef6cb835ada70f14b1ae6178e761a661d783f42d77b2168be328635b51bfe61a9dc32 SHA512 1de3fa054e64f24cf45bf89dba133c60f24a79b8ce6abce7ad4ede595110cfda22121fa636f8d2c48866e68175008505299fc5e020d834e413eb34859711b313
 AUX aee-Wformat-security.patch 225 BLAKE2B 0e3846a9e616ed9cef7a9f2b01bf6f71f080d8817010e6befb89cbbda28fa3f8c85f47f9f6f3c06236da64d0110dd8d3426ee7c6fb646398467b493564d50fae SHA512 bc2647b6e29ed039dd683c15001f7ee992091221ee9851bd302c066ce7c49ca6bcf01ef5eb111b6d998804074855eea497284a579835e3d335d7bfe422dad190
 AUX aee-ae-location.patch 2755 BLAKE2B 8b75ee712b5f717c82a073c0e35ceccdc0ed27d6b9c8f64841d6c246cd6761b5d42d121e78374029b0c0252c479ca56ab072c7612d0ef758641cefb1d32459f9 SHA512 48ded083b407d1fb94764967358dc6c858421a3586e56fca1803980912b90404dcbfcadfc5a041b0959e2e10b3a5224751671ec067687b2e361eb2e27eb86cfa
-DIST aee-2.2.15b.tar.gz 184218 BLAKE2B f249c0974a971aa6a1bb38afb8675a3ace671d244c717add4ea2f724ac1d07bf1c57c5d27fb6f9f40f27b3055ba94cf959dd4b855181a83f4522c44124c0b994 SHA512 2810cd8f5148edb352fdaefbc823d417b9a83c8083644c8729be8595013ca8ba660bd72120db1e15915e454f5185d2d030c2f0c853b37eb83c213c1d581a640f
+AUX aee-gcc-10.patch 706 BLAKE2B e969db928f0327a070ceaa9808cdae3cdafb3588e94fd8414fbca7b27e0c17bb12e542531f162c2de135a88bc09168bd77c9a2ee2368499a39ce7760f99aa0f8 SHA512 bd560e541af9323feeda9f9138bf28c21af6d0099fda7f014ae82dd988f3fd6f9d2abf1c4883610a20b3708d48d8392bc3e60a01c3798604e6c6dd60f8f838f9
 DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a
-EBUILD aee-2.2.15b.ebuild 1224 BLAKE2B 245976628269fd328d3923a0e302d42a2fc93168efc4c308749d4b95b6005dceec491d587aea9ab182b95cfd096470a8d1852f8096165e6da7526ac9b1742b1a SHA512 0a8047efc8c58561e49c186b96035c9c8b340194c7332efdc52fe6ba578f9960161d2500abb0a898176ad685b4267f0f8d287374307e5505794edfb13fc32247
-EBUILD aee-2.2.21.ebuild 1227 BLAKE2B 097ed3e56e30e7b73782dad3c195ce182c13acd3a4e765f6816d31b9dd4f0d47984edcb0c6c55f229e15d2ad4a036ff0bd41a4dd9cfbadd61633b60c582f394f SHA512 8d7f1abfaa36cc1cbd4e7bb170e1fd9e938956e050fb03b0452dc04e9aded3052c5db92b674f5f78ac990756ceda6ef42c9a675414543ffecff74a52b3f3d9fb
+EBUILD aee-2.2.21.ebuild 1256 BLAKE2B fb4407c3e59663529373561ff7cba079cce97c347203d2c876db6511d18bc08181b8c3008edb163153f7d2d8092c57204bffb12eee196368c3cc5679c102476a SHA512 d73bfe90989391372e3a5b968110feb2a8a9ccd9405d814a681c432965606169ec15a257137ff9fb47db3b906c720d1f3fc18b65dc95dad0f2f265dcf979417b
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
--- a/app-editors/aee/aee-2.2.15b.ebuild
+++ b/app-editors/aee/aee-2.2.15b.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor"
-#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ae-location.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
-
-src_prepare() {
-	sed -i \
-		-e "s/make -/\$(MAKE) -/g" \
-		-e "/^buildaee/s/$/ localaee/" \
-		-e "/^buildxae/s/$/ localxae/" \
-		Makefile
-
-	sed -i \
-		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
-		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
-		-e "/other_cflag/s/ \${strip_option}//" \
-		create.mk.{aee,xae}
-
-	default
-}
-
-src_compile() {
-	local target="aee"
-	use X && target="both"
-
-	emake CC="$(tc-getCC)" ${target}
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/rae
-	doman ${PN}.1
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins help.ae
-
-	if use X; then
-		dobin xae
-		dosym xae /usr/bin/rxae
-	fi
-}
--- a/app-editors/aee/aee-2.2.21.ebuild
+++ b/app-editors/aee/aee-2.2.21.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

 inherit toolchain-funcs

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"

 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="X"

 RDEPEND="X? ( x11-libs/libX11 )"
@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-ae-location.patch
 	"${FILESDIR}"/${PN}-Wformat-security.patch
+	"${FILESDIR}"/${PN}-gcc-10.patch
 )
 DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )

--- a/app-editors/aee/files/aee-2.2.15b-ae-location.patch
+++ b/app-editors/aee/files/aee-2.2.15b-ae-location.patch
@ -1,89 +0,0 @@
--- a/aee.1
-+++ b/aee.1
-@@ -678,7 +678,7 @@
- .\"
- .SS Initializing aee From A File
- .PP 
-\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR, 
-+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR, 
- .I .init.ae 
- in the user's home directory, then for \fI.init.ae\fR in the 
- current directory.  (This file may be created manually or by using the 
-@@ -960,7 +960,7 @@
- .PP
- On-line help is provided through the 'help' command or menu item.  This 
- command uses a file with help information.  By default the help file is 
-located in \fB/usr/local/lib/help.ae\fR, but this file may be located 
-+located in \fB/usr/share/aee/help.ae\fR, but this file may be located 
- in the user's home directory with the name \fB.help.ae\fR, or in the 
- current directory with the name \fBhelp.ae\fR.
- .\"
-@@ -1017,7 +1017,7 @@
- .\"
- .SH FILES
- .PP
-.I /usr/local/lib/init.ae
-+.I /usr/share/aee/init.ae
- .br
- .I $HOME/.aeeinfo
- .br
--- a/aee.c
-+++ b/aee.c
-@@ -2612,7 +2612,7 @@
- 
- char *init_name[4] = {
- 	"/usr/local/aee/init.ae", 
-	"/usr/local/lib/init.ae", 
-+	"/usr/share/aee/init.ae", 
- 	NULL, 
- 	".init.ae"
- 	};
--- a/aee.msg
-+++ b/aee.msg
-@@ -2,7 +2,7 @@
- $ 
- $set 1
- $quote "
-1 "/usr/local/lib/help.ae"
-+1 "/usr/share/aee/help.ae"
- 2 "main"
- 3 "modes menu"
- 4 "tabs to spaces        " 
--- a/help.ae
-+++ b/help.ae
-@@ -1058,11 +1058,11 @@
- 
- 	The file 'init.ae' may be used to set parameters and define keys to 
- perform certain functions within ae.  This file may reside in three 
-locations: /usr/local/lib/init.ae, .init.ae in your home directory, and 
-+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and 
- .init.ae in the current working directory.
- 
-         First, aee checks for a system level initialization file, located in 
-/usr/local/lib.  Next the user's home directory is checked for a file named 
-+/usr/share/aee.  Next the user's home directory is checked for a file named 
- .init.ae, then the current directory.  The settings from each file are read, 
- so that the directives from the most recently read file will take precedence 
- over previously read files.  This allows, for example, the .init.ae file in 
--- a/help.c
-+++ b/help.c
-@@ -12,7 +12,7 @@
- 
- char *help_file_list[4] = {
- 	"/usr/local/aee/help.ae", 
-	"/usr/local/lib/help.ae", 
-+	"/usr/share/aee/help.ae", 
- 	"~/.help.ae", 
- 	"help.ae" 
- 	};
--- a/localize.c
-+++ b/localize.c
-@@ -64,7 +64,7 @@
- 	catalog = catopen("aee", 0);
- #endif /* NO_CATGETS */
- 
-	ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae");
-+	ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae");
- 	main_buffer_name = catgetlocal( 2, "main");
- 
- 
--- a/app-editors/aee/files/aee-gcc-10.patch
+++ b/app-editors/aee/files/aee-gcc-10.patch
@ -0,0 +1,44 @@
+--- a/Xcurse.c
+++ b/Xcurse.c
+@@ -37,6 +37,8 @@
+ 
+ extern int eightbit;
+ 
+struct _line *top_of_win;
+
+ static WINDOW *virtual_scr;
+ WINDOW *curscr;
+ WINDOW *stdscr;
+--- a/Xcurse.h
+++ b/Xcurse.h
+@@ -132,7 +132,7 @@
+ 	int number;
+ 	};
+ 
+-struct _line *top_of_win;
+extern struct _line *top_of_win;
+ 
+ typedef struct WIND {
+ 	int SR;		/* starting row		*/
+--- a/new_curse.c
+++ b/new_curse.c
+@@ -85,6 +85,8 @@
+ #endif
+ 
+ 
+struct _line *top_of_win;
+
+ WINDOW *curscr;
+ static WINDOW *virtual_scr;
+ WINDOW *stdscr;
+--- a/new_curse.h
+++ b/new_curse.h
+@@ -161,7 +161,7 @@
+ 	int number;
+ 	};
+ 
+-struct _line *top_of_win;
+extern struct _line *top_of_win;
+ 
+ typedef struct WIND {
+ 	int SR;		/* starting row		*/
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@ -1,3 +1,4 @@
+AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 830 BLAKE2B ccded20d0b24cf7a236a849bd8c3ebe350aba15038ea49bb499af0a7a4d9b29978b29d82e05963251ba45267ab2a471ec0a027e6c2e3fd5b6e124163b306b96b SHA512 f97dc85dcd00233d110ee2de507019e77dff40023b82e1413e7403625ffc976165c952e4026311ae647021bb0170e115374f8af81b41ceb0e5b065f82309867c
+EBUILD e3-2.8.2.ebuild 842 BLAKE2B 22e0ce8013a0ca6ce4666485677927d616016179a4cdcdf901dd82ee400a6380c301ce2c1e599f24cba945801c2c1fddc66407e60f88434ba8cc17667896402f SHA512 99cd2915430b264acf41f38bb21f65c9007d83c2568c2a4f74fa404993b4a7920834deaf1dad01896cb777bf9d9177b7b7e439b8b602803167c94c0bca474019
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+inherit toolchain-funcs
+
 MY_P="${PN}-$(ver_rs 2 '')"
 DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
 HOMEPAGE="https://sites.google.com/site/e3editor/"
@ -16,14 +18,10 @@ RESTRICT="strip"
 BDEPEND=">=dev-lang/nasm-2.09.04"

 S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i 's/-D$(EXMODE)//' Makefile || die
-	eapply_user
-}
+PATCHES=("${FILESDIR}"/${P}-makefile.patch)

 src_compile() {
-	emake -- $(usex amd64 64 32)
+	emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
 }

 src_install() {
--- a/app-editors/e3/files/e3-2.8.2-makefile.patch
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@ -0,0 +1,36 @@
+--- e3-2.82-orig/Makefile
+++ e3-2.82/Makefile
+@@ -17,6 +17,8 @@
+ NASM_OR_YASM=nasm
+ #NASM_OR_YASM=yasm
+ 
+LD=ld
+
+ EXMODE=SED
+ 
+ #----------------------do not edit below line-------------------------------
+@@ -41,12 +43,12 @@
+ 
+ 32:	$(ASOURCES) Makefile
+ ifeq	($(OS),LINUX)
+-	nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE) 
+	nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS)
+ 	chmod +x e3
+ else
+ 	echo $(ASVER)
+-	nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE)
+-	ld -s -o e3 e3.o
+	nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS)
+	$(LD) -s -o e3 e3.o
+ 	strip --remove-section .comment e3
+ endif
+ 	ln -sf e3 e3ws
+@@ -60,7 +62,7 @@
+ 64:	$(ASOURCES) Makefile
+ 	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
+ 	$(ASSEMBLER64)
+-	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
+	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
+ ifneq	($(DEBUG),true)
+ 	strip e3
+ endif
--- a/app-editors/ee/Manifest
+++ b/app-editors/ee/Manifest
@ -1,6 +1,7 @@
 AUX ee-Wformat-security.patch 675 BLAKE2B 2fc022761f61081616565ab2161094aa40b6b13345063ddc59621878dd35153b24bc3bedc03cf7187d48434c34b331c6201c3577dce96d10983c3c4e3102aff2 SHA512 d6b8dc118c3381da71ea7d10673af52d8d36575480a274d5e0f30645e86b082d5381ee7682fcf9b253b621ba9138a350b132875ecdc9b2fb5ed75bd111ce5304
+AUX ee-gcc-10.patch 352 BLAKE2B 7e1d9bbb12d21445117d108f666884959fa239f2c7a48e23b3c5408e300d7c15c760879a6d86d85c90b943823cfaacc83ef9050eeccf5ba8a63d26eb0ef1153f SHA512 58a5795e4bac9ef910b10201af69c9fbe99caf6ddfe8346873eba5de32fdbcd4b18cfb57c76a9c26faeecfe6fe2bbb7503e5ca9eb03a73a0ee7b003c5bdd7014
 AUX ee-init-location.patch 1280 BLAKE2B ad20c44a30c9b817af997966d191640860def4a7f1dd63678f4befc8390ce22f254d802b4c75998ad874551ef90aff727273b6abde60f28f92412a9ce6507cbc SHA512 69732f151f7d8e9779c6826c89e92e9e4b5a8ab1580b8de562897a322e61514e3225eaecb9e2bf9fdf7063a126382ea9ba9ff7c233b2bebd8d4062b61b20375a
 AUX ee-signal.patch 222 BLAKE2B a514c6d060fde8c71d7a0dbb22d1d6843c9195500e5b675cda79645785a965f20144d26e558daf4f2acb6dd81d735ee4929991ea40d7bf88e091769951b20830 SHA512 9ce2f028d131b2ca47070002603b40c6841e8c69448cf419128cbf9519df928249de0fa7d1c9e906ea2a0368e8b6f9603ab26e8d0d352cc647e2ca9c5a93213c
 DIST ee-1.5.2.src.tgz 69651 BLAKE2B 2d79b889ad5c97d4f2e134acec235f8f1dfbf0c697936de326be448e0bb193f06cbaeadf5a99050fc47f0526bbeb571522513f363695190c1801c62aee1594f2 SHA512 9ca0e82d65971b0bce38e09c365b6eb8b81ca6ff5b244107ae254322e47e841e7f5345bf242a0a9dd66b731d46cead6f442016b9e070a1298e1a5319b1d7b97a
-EBUILD ee-1.5.2.ebuild 1127 BLAKE2B d4071be3623f1790e3e0c68672bfd16526f4e0809cc16b3e10ab4e8980a662c93c9601aa7d338c49ec4de9e68f6323f87743bbfd2d199472e7c628ecfcdefe33 SHA512 b1d70ea533e12104f926d7cd8320a86f11bbc5fa5b066c1512d977b8b8111f7e644231d41f1213a8aa3845bfa4a8548b872e575c590384a47867f29bdc657b3e
+EBUILD ee-1.5.2.ebuild 1158 BLAKE2B 34e78c6c8d75e7639b1cfdfcb962b0586ea216ea3687ff806b39ab48464f404ea0c4edfdf245b2ed73b9f930cf026974f0e79d8f319e55b2a9a0800dd6790e96 SHA512 24b7e86d667ddc6f0fc8cb4b1b26b0c62d17be77c0cd7b8d54c19acfcfb1378d5bba4980655ccbeb32ed7e7c15c3c858c4f0822657e1ca98b759567d4cbbf797
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

 inherit toolchain-funcs

@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-init-location.patch
 	"${FILESDIR}"/${PN}-signal.patch
 	"${FILESDIR}"/${PN}-Wformat-security.patch
+	"${FILESDIR}"/${PN}-gcc-10.patch
 )
 DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )

--- a/app-editors/ee/files/ee-gcc-10.patch
+++ b/app-editors/ee/files/ee-gcc-10.patch
@ -0,0 +1,22 @@
+--- a/new_curse.c
+++ b/new_curse.c
+@@ -83,6 +83,8 @@
+ #endif
+ 
+ 
+struct _line *top_of_win;
+
+ WINDOW *curscr;
+ static WINDOW *virtual_scr;
+ WINDOW *stdscr;
+--- a/new_curse.h
+++ b/new_curse.h
+@@ -161,7 +161,7 @@
+ 	int number;
+ 	};
+ 
+-struct _line *top_of_win;
+extern struct _line *top_of_win;
+ 
+ typedef struct WIND {
+ 	int SR;		/* starting row		*/
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@ -1,4 +1,5 @@
 AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
+AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b
 DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
-EBUILD fe-2.0.ebuild 784 BLAKE2B f4639eb6e54589ba2c6b3b6cac195859585d8b422eee73062f0bda9d95eb6ae340d6f35165a20c32402814b9fcb9c49678f6925658b8a252e6ada23a940b7ed0 SHA512 1f7dc3bdd3a7c04c3ee0bbb0f90dabfc0814edaee82e97cc3aacd5633337e5a42660b1ac45d03080af38bee522184f76731d91304d4b513301b9bb4be28403a1
+EBUILD fe-2.0.ebuild 859 BLAKE2B 600346c9cd0ea2ffa6795579dfb05eb5af3307e9e63531049b717db05fcd140136d0c8d005cb0fc388e24c24c55cfeb6992cf324b782a9177f137c44f88b5b9f SHA512 d09002589b3c4a279131ce179bdade3772971980ad9bad00d3b9023b49f1a34e237fd083bb1b76001bfaece4608c54cbe26b72e0a9147e922bf9f1289a44513b
 MISC metadata.xml 1259 BLAKE2B e393bad45601c7e357aa4c4e5e6ede35cdd6758a1cc251cfc3acca0e8526ffb696c0ca484b312be14d23a05d8996ce7fb3bee37fe7a8c9bc72d5c507c26729df SHA512 6539d808d3cd85bab1985dbfb69ddbd01166a4e6dcf66d0f138d1ff1e52d9b7342ff3b468e031f9372308533296e28eb978b00954624890a897b5f41c222f701
--- a/app-editors/fe/fe-2.0.ebuild
+++ b/app-editors/fe/fe-2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -19,7 +19,10 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"

-PATCHES=("${FILESDIR}"/${PN}-1.8-makefile.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-makefile.patch
+	"${FILESDIR}"/${P}-ar.patch
+)

 src_configure() {
 	econf \
@ -27,6 +30,10 @@ src_configure() {
 		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }

+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
 	emake \
 		prefix="${D}"/usr \
--- a/app-editors/fe/files/fe-2.0-ar.patch
+++ b/app-editors/fe/files/fe-2.0-ar.patch
@ -0,0 +1,21 @@
+https://bugs.gentoo.org/722036
+
+--- fe-2.0-orig/Makefile.in
+++ fe-2.0/Makefile.in
+@@ -15,6 +15,7 @@
+ CPPFLAGS=	@CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\"
+ LDFLAGS=	@LDFLAGS@
+ LIBS=		@LIBS@
+AR=		ar
+ 
+ CATALOGS=	de.mo
+ OBJS=		buffer.o complete.o display.o macro.o misc.o msgline.o
+@@ -27,7 +28,7 @@
+ 		$(CC) -o $@ $(LDFLAGS) fe.o libfe.a $(LIBS)
+ 
+ libfe.a:	$(OBJS)
+-		rm -f $@; ar q $@ $(OBJS); @RANLIB@ $@
+		rm -f $@; $(AR) q $@ $(OBJS); @RANLIB@ $@
+ 
+ install-po:	install-po-@USE_NLS@
+ install-po-no:
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@ -1,8 +1,9 @@
+AUX hteditor-2.1.0-AR.patch 362 BLAKE2B 7698e475679e730f4e5642f1acfc802170810699209c6e68d6587075bf95502eaec18e618b065b4072178e9d4371628331af1d867495c7283380facc07594a24 SHA512 3b656378c025e94fa480b942ae9ce073b9af33a062ba9806d3baeb2b091df1a186eee87e58e1ddcb9823c97db4a68f0f69ee0584aa0b4bfb03f487bc28dcf7c4
 AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f
 AUX hteditor-2.1.0-gcc-10.patch 989 BLAKE2B f4678cfa1eccc741005d4a51d4c74f4d01c0f62594b1f138121758db26b24c4a588430a43f4cae5d9b6f4032236c4f6478b385542e060c37225859d9cd78ba93 SHA512 2fceb761e1ef4225917a66db2fabac1a38072e83ce0fdfa9bdc592d34f9f7870c2a0aae971a4ebe7baffb52203f6b7b906e57f672925fbaf0c8ca77fcebf1a2d
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1245 BLAKE2B a09a2fd5338de9df7f5f7effe9692d0c80be642a0362f38b0fecb45224161de4b2a926662e8cb52b4b802ff6fc47f67fc258faf96e66dd93cc818ad0573f14b8 SHA512 d4be8a225b7c710b6350b70113cfadb869b4bf7a4a953871550d613f3183a0a5888e8cf36a87ad17ec25a57c392587719a745bd97ca2cbe75ef5b3206bb017f1
+EBUILD hteditor-2.1.0-r1.ebuild 1189 BLAKE2B 9f8d20d19df3f7d853e2a6a7fa132a595ebbad5ff0837d247f2ed14cc886e0e517d72ad7dbbb200aecb23f3154cd308761615237c054d3edd1785ff9c98fa324 SHA512 8a2e8a8271926882de6f878aee001c54324730c621a1a83d32fed7c3c4ebddd65fd2ee3e83250e1e60ea7626c472236d42e98258b32ee59778ceaa9b9bf0e793
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
--- a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
@ -0,0 +1,14 @@
+https://bugs.gentoo.org/722040
+--- a/configure.ac
+++ b/configure.ac
+@@ -104,8 +104,8 @@ AC_PROG_CPP
+ AC_PROG_CXX
+ AC_PROG_YACC
+ AM_PROG_LEX
+-AC_PATH_PROG(AR, ar)
+-AC_PATH_PROG(AR, gar)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(AR, gar)
+ 
+ if test "x$AR" = "x"; then
+ 	   AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***])
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc-6-uchar.patch
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-AR.patch
 )

 src_prepare() {
@ -46,10 +47,6 @@ src_configure() {
 		--enable-maintainermode
 }

-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
 src_install() {
 	#For prefix
 	chmod u+x "${S}/install-sh"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@ -1,4 +1,5 @@
 AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562758bcb7c3fce318ce6c72eef12201c9b332ea1309e4f4a20a6ea3051b8eab997413af08b4fc52fe1339 SHA512 12a89496192f10a221bf3be386339dd2494304f5e0e8c8ebca1d9e622b5304609b01370d64b009120f333794a41815fd73124114035e02ce53241f58e9968546
+AUX d-mode-2.0.10-rx-form.patch 728 BLAKE2B 04ce4363c53ea316297c316bd2a5c60f2f6ac9e1bc37a67fc7d979538e3ea33aea1a6d53b8d5565e83c50814401d9330b71a377d6d8df29c8b3d5490c38cb3bc SHA512 b2c0b4a542280b5eb9bfe54bbb0249ad0461002f630829775a78e60db6c9e71b138606625d4ffe9b4322b6facb57e232079ddc372ef6d1820d12ba693c889c84
 DIST d-mode-2.0.10.tar.gz 22394 BLAKE2B 16993c1da1b4362df4ef4674f58645da13466d6bf9a6215667a70868be7f6d3f992f0e60d9a3b6c4bcac7c3f4014fa987bfec2f3ee4e1503740efe316f29d249 SHA512 510ee3b1c1288b4b6772cdc9c436d691cc4c09fd1337886abe9a8c86e64a6fede3d8e2aaf46e847417cb667d36f9c5db3c446e7f5ca88fe2bc8b8fb80bcd1297
-EBUILD d-mode-2.0.10.ebuild 518 BLAKE2B 28995c68a007466c48cfd2d53e58d053633533cbf1b8e377762d7b3bfaccae7a03a80ae56f1ff150236dc8cab40091604934cde45fe03b2f9e78f012297d155b SHA512 00fb22f20f8d5ab16c7471f2c8f0f64a48af7c2b910accde3aeab00f59b24e79b92de8c19d3e0128d18ac8779083244cfe9a7b61e2fa72d435770617d67dc2fd
+EBUILD d-mode-2.0.10.ebuild 561 BLAKE2B af69024ac739dfa47704ba8f2c7dc4db652e63338a2b0c95173be48f6b9e11f77413327f4884ea5a8f9c7ba4dd88a1d122d250782f2a19bc5cdc1037a265e6f2 SHA512 c85a9c84080611b402359946a8c141103b185413d10c4bdf3ab23afa50c0bb8918255c4318ef5ddb2262c68f92e88600a90441ffad586d79f7ecf48eee2463c0
 MISC metadata.xml 382 BLAKE2B ca4199b6d9d35540d53a4bc673fa59babecd80579ede4c227954492ef2591d6d09e0d3938629f21606c7547ed3155d733582a1298067ffaeaae20bc0b5218e28 SHA512 8a55a3ae2146d4ebeef5075312482f0962e8e219f73cc9997c7ba19978830d42ac22c02b84be34a377841858d9fc19d85ce9243546759e8666230e9c311347b0
--- a/app-emacs/d-mode/d-mode-2.0.10.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -16,4 +16,5 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"

 S="${WORKDIR}/Emacs-D-Mode-${PV}"
+PATCHES=("${FILESDIR}"/${P}-rx-form.patch)
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
+++ b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
@ -0,0 +1,25 @@
+https://bugs.gentoo.org/722012
+
+From cfd1d0869d51b7548b3fb738b2f2593c76533d44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Per=20Nordl=C3=B6w?= <nordlow@users.noreply.github.com>
+Date: Wed, 9 Oct 2019 11:03:00 +0200
+Subject: [PATCH] Use rx-to-string instead of rx-form to support Emacs master
+ (#97)
+
+---
+ d-mode.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/d-mode.el b/d-mode.el
+index f8211cd..df72b8d 100644
+--- a/d-mode.el
+++ b/d-mode.el
+@@ -210,7 +210,7 @@ The expression is added to `compilation-error-regexp-alist' and
+   (add-to-list
+    'compilation-error-regexp-alist-alist
+    `(,symbol
+-     ,(rx-form
+     ,(rx-to-string
+       `(and
+ 	line-start
+ 	(group-n 1 (one-or-more any))		; File name
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@ -1,6 +1,6 @@
 AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aafdedd01f36fe93f3cb6150792b5ed09ef5fd859211692f766fb8e931581c5e9cd60401d6eade364696edec SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93
-DIST php-mode-1.19.1.tar.gz 94857 BLAKE2B 65ecb228fd4cd2c09cf38836b7d04ac270051976dc97dd7a3124f5a86d4e95bf9a097c6885f55c0ea40599fc2d3f813204e7f28a5f75223cae9eb51e74136017 SHA512 ca4fd798690d5b855a8d4b0cf5b631c32a561466b7697c9498bd89ad1059b774616acab10e30877b3053ba613b63db5da74a479c0a09c57b9b7b2350f42e68dd
 DIST php-mode-1.22.1.tar.gz 90539 BLAKE2B 3cf2f282cbf87d7dc0ef15d81341de851ad95b7f5426ab6495e55729774fa9d1a32bbc36dff40869c219c71e0ff5d55642f99782a18722c94abeda78b45e0023 SHA512 482f07bec5f8ce21396cd4d39b14dbfe47d73f4e06b7b178b3e01c2dc51f89f1693a032384e4ad812c46a344e531a4a626c4f8eb414fe22dfadd9f1a71c55238
-EBUILD php-mode-1.19.1.ebuild 507 BLAKE2B 479b22bfa2025f6c451eb7241533a5bff188495bbcc01e5c3c2817995ab0a4d3e909a0dcff752b95477bacb584087a58bbc6d5fecee4ef13fcb131fa4081f480 SHA512 79adda0a1cbcd74af2b1b26c701ac9e559e9325456d52f4deee568bc4341b67cd4a657351477d8eec3f406b20544644c838edc1212158f3d386d73b64277ef84
+DIST php-mode-1.23.0.tar.gz 94451 BLAKE2B 324eda995ba8d93ca9bec691c88b05caac3d6786b2d1caac39dc34f513e8a026b3803ad3712729b147a8ee839fe337bf11ebaa1b718cb4c741997a9e1c9279a3 SHA512 051adf317ac1dc4ae14b3aaad9aa15ef650a74c7c1ff134ff9a26664cc7494b522957d9cbed981ec398e9bdc6ccae4437c628b2fe3535e8f2a95da34363ec88a
 EBUILD php-mode-1.22.1.ebuild 489 BLAKE2B 3e5205d2c9e19753905442d8d85ca9bbde730cb100a6d377a006d26a39f88f038e76168e67e2ceee540efdd9623dd155c3a5c3794eec621117107563064095a1 SHA512 4b666428f344d42e2d672eb481d715aefb0b5f45c984f9f1782a004d903a1c21a2bb9d9119f6beb5f306faff3266cb074c79d11756ac34e02253c4dbd45a0f47
+EBUILD php-mode-1.23.0.ebuild 493 BLAKE2B f0b338f0c4a4878b7a19df0ed6b08c7b00e6be95dd2700b1ab5bda0a4fa39c03c35936c11626c3a2c57ae14a0989f3de4f74af22937567359919ba0e78f7464c SHA512 48b20b80aa6a528c2f7a7b5766999e28104d17075f36aeee3924402f9d2f027a4b607e7d0bad13c15457dfcec1c46c2f609e9715371cbfef81131f4bbd3fee89
 MISC metadata.xml 358 BLAKE2B e43dc1a1d876d29121c6745f2e66c3b3585ea5ab0aed824c28bece59078fea9df0f6f438701dfc64fdbf90cb258091d5b96b4dc8fa320161ee241fc17be0a4b9 SHA512 eadc968656b4fe2150fd3d360c32d3fc66d42408c61ea60b3df5be2ba6cd3ed6abec1ba45e37269f5d06721eea30d3dbf95f3a747000e5b5d60e614c56ce3f85
--- a/app-emacs/php-mode/php-mode-1.23.0.ebuild
+++ b/app-emacs/php-mode/php-mode-1.23.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -12,8 +12,7 @@ SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"

 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md Changelog.md"
-ELISP_REMOVE="php-mode-test.el"
+DOCS="README*.md CHANGELOG.md CONTRIBUTING.md"
--- a/app-emacs/xrdb-mode/Manifest
+++ b/app-emacs/xrdb-mode/Manifest
@ -1,4 +1,6 @@
 AUX 50xrdb-mode-gentoo.el 223 BLAKE2B 2d2d85455f676760bcce88965406a226528da07d29f34b409c35f539e2dafe6750a35e6472194c0969fec7dda3a04abb65ded5dd6b1be3ea0a0cd63fa9a2f03d SHA512 324609b05517c26d58759bf3c4445b690bb8c8ab00361f3157b06964458f9ca777d8963ac9c5e49df6c75d4d8eb27ea7754639bbbb8d1550b96fdbc954b3ed5b
+AUX xrdb-mode-3.0-backquotes.patch 355 BLAKE2B b465b94aa8960d2d2309fa72db08236deb63ed4d3c7b763f93e7ab9c10f08636c8f5e7f5eb095b102fc50c46b67c48c3e2c126f6e8f3b6714a86734fc1e7e889 SHA512 75379ce55eda18df7102c35ea8786eebf18a015ae3e7c6a936ac7794b5a4e24b610ad21c228761d390467622c876cc34d97e3709d8be91c8fc70fd049f09e01f
 DIST xrdb-mode-3.0.el.xz 5448 BLAKE2B 32ce6b427ab2338d66a52c722ae3c69e1966c53cd63be15c35e218b17cb2c7476da5d5c1e49df3df1114b97382724f273f2f302abaef5995b5aa53824673867a SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290
+EBUILD xrdb-mode-3.0-r1.ebuild 550 BLAKE2B 811c30e5d0dfe922e736ef17398381f7ea32340547c3d50182f6904ebce2660b318788c1ce12260fd87da45613faebdf1357f8cb84f952999e784053551c26d2 SHA512 6b9158ff80745ff7cb21b193f7a6c2c02097f016354250b59f1507c85e733226d9da4d192a41bd6f5dd76a6ead92796e3b242e6ae01cb9199ec9c051aa8c1026
 EBUILD xrdb-mode-3.0.ebuild 505 BLAKE2B bf3d1f240e3be4d56e1315cad7bf5c14d962196d7f55f74720e5cd7a8ef2519aeea2f9b04d9bfcf444b2b90afa7bd22eb128b0d9e52027a6a1917ff27a44c503 SHA512 6da052641466348b40dd059761a3591dbe69bc7750650088367fe14034d5e7b799aaa7f33087fca4277d287128b33ae53fa5fbd89230aa2641c8e36c2236b82c
 MISC metadata.xml 357 BLAKE2B 5f0984d66c30be81bdd275c54b1171fc16a714b95f74da7700518cfece8d773433d1ce8151968849ebc3b02c255686e086e2f2282fd9b09a340c2c24da48b334 SHA512 3a98228940548b16f0ff1e6a33bc4d5a2c0d4b650187533dfd431e8c1fbcc59c3c5587a9df1d2bbfcf8c161ade94af51a5b95475fe3900e68108dd86924904d7
--- a/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch
+++ b/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch
@ -0,0 +1,15 @@
+--- a/xrdb-mode.el
+++ b/xrdb-mode.el
+@@ -178,9 +178,9 @@
+ 
+ (defmacro xrdb-safe (&rest body)
+   "Safely execute BODY, return nil if an error occurred."
+-  (` (condition-case nil
+-         (progn (,@ body))
+-       (error nil))))
+  `(condition-case nil
+       (progn ,@ body)
+     (error nil)))
+ 
+ (defsubst xrdb-skip-to-separator ()
+   "Skip forward.
--- a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing X resource database files"
+HOMEPAGE="https://launchpad.net/xrdb-mode
+	https://www.emacswiki.org/emacs/ResourceFiles"
+# taken from https://launchpad.net/${PN}/trunk/3.0/+download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=("${FILESDIR}"/${P}-backquotes.patch)
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@ -1,8 +1,5 @@
-AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429
 AUX cadvisor.initd-r1 567 BLAKE2B 8cd59227cdc07047c6c62fbcf74ec942468b86881d9b149a44fb60a10d8ed2a07c0cc97d59a9acf6dabac55969a77a6c69305893a4dcc90d10df9f4b007186c6 SHA512 84124c91f718446473644f3ed9e82592b1dbf14aecbf13a0a31a58938df19f8f65a108e03d0f377866ddc9d68cba1cb6963c2e5b9c384e6f6df441b504384460
 DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
-DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
-DIST cadvisor-0.35.0.tar.gz 5268930 BLAKE2B 065619ee459062bb521e855ccfd576afe236863bdc203b65e53a7eb6aec7172b6b9bb1d4183667ed36c471becb09fd974d1e4f809cf614f4d0d03ea3b87c2f63 SHA512 9fdae170fd167e0b1a2b69112ff2ec081640a144490c04e364536cae71a90e2c2845857f35af81ec58d4addd3675fd86b045d1f1b99a3e281f6270ab5d2a70f3
 DIST cadvisor-0.36.0.tar.gz 6182273 BLAKE2B 0406bd88c6595f23de06be1e63e7c0affda7f94a3bbbb1b9e390f2747fdd3ef3199622a5003b79ed083a0cd80e6c013d7776e18269044150dafb98341c54425b SHA512 2da8a2e81d33b97e6f7c5ba3982e51b6d87748b138345ff94eb7671df851f0a535ceeef61358b0ee43bc161a88becdb153065bd7ff8fc9d7c390a4629ad10f02
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.1.1-0.20160913182117-3b1ae45394a2.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.1.1-0.20160913182117-3b1ae45394a2.zip 889396 BLAKE2B 37e1420148340c6d59d3bdc554c8d92ccce4dc145403915d067fe18966fa8baea5a3090714dc8d27c8c24831ca71213c11f1c719d0044647f887590a9b5bcc62 SHA512 f5d89d8eed8a58bfba541ab1102db390e6b4e7ce181f9d6e166c03685cedb1974169b298074bf8c5b2ac7c1e965e0e9794d379a9bb6537a3a11deab41fbec772
@ -412,7 +409,5 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200117235808-5f6fbceb4c31.mod 164 BLAKE2B cd
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200117235808-5f6fbceb4c31.zip 139116 BLAKE2B 0de019e1229821d8c2c53df204e6f8f9c3b80f1b3fe5ca6ff7482dd8f684c2bec95bdbfcfe84b9fb54fe060687d4f0740759a24aaaac27dc8d4794a4157d01ff SHA512 a67bcdc90e4d5395a2ff1ec6030bbbbd105a7a8cc564abdef28fed07a3d7a53382ff06b36b10a59f717e52d3fd3b3a54e92ff98ccafb31096fc03f7d78ce3cdf
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200122174043-1e243dd1a584.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200122174043-1e243dd1a584.zip 139668 BLAKE2B 503f321d47d7e30d85b1c6ef96cd136901e3a4d100cfad50382d2f88f312d0c525b134f0414abf3e03faa6ed86a665646746e848c2f55a8747f7fa90f0d9e4cc SHA512 631e2314df6041fc800bf34e10359894223f7500034d6a53ae578a117f05602708ae0030a312656a15147064ec8a17465f0c917ed400d4fc5b163e6ece89c764
-EBUILD cadvisor-0.34.0.ebuild 1119 BLAKE2B 6e6346ce9c4d8f5f7c46a11683a74b6efbc3479856633a50814ec2675a4ce71c3f0b102e7eb18da407d84b5e55b7c804bdb1fdc589cb20f066c80ce2b553df36 SHA512 0fedf5a3b41fd886e8d8c6f5ef779a3e32108d794c750302b0183634ab3cc33054b80fb25678ccc232645c4f9dc72249b413c2532868f3b9fcda5565d9c61bb6
-EBUILD cadvisor-0.35.0.ebuild 1142 BLAKE2B bf4fb604d8138610920e6d4870a5604c26b731b581dacf60ddfed470d1fb09d0689c9489b57c0b274694459b063bca8195c80045f82ed28fd8dfd80e5175d0ca SHA512 ceb1edc4f056a113c9696c5aae291bf8006d1de720d89988975d44a03b6f9b27eef8a43516042da5185ae2178e9004655b718bf38b63fd7ff8e2a789025a849d
 EBUILD cadvisor-0.36.0.ebuild 24922 BLAKE2B 320f81e18fdee811020bb305fab4f23bf45988adcd06444155f9ad3cd1a679ab627cbd9f3f115f4872cb240af0589faf8ba35cb30ec8be1457b486d785fa4043 SHA512 c91287a161734aa4e9315aba9eadde6400d8a0645d0d52cf2d6ff020763b04c0ff23226bffc6c49b04b247e7b17ee07995bae4da32ab00c606cac02f73010ce1
 MISC metadata.xml 328 BLAKE2B 61bca93d2712241a0988c8b6b2da6859b4bd1e3dba6209d6628c4b69e00a565410ee8a46ea8132b3edf2269a8ab7b44083e59bb4f5d5568c52794ece55130316 SHA512 29a397dddc11fcff90776fb2d90356c162080b7b6ffa24633b7c89d9c0bbd208e5cc3aa77a89ffdd7f81c1f618124883be342566c6b6ab3bc92e443f4c39da09
--- a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
+++ b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/google/cadvisor"
-
-inherit user golang-build golang-vcs-snapshot
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-COMMIT="24a6a52"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
-	sed -i -e "s/git describe.*/echo ${PV} )/"\
-		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
-		src/${EGO_PN}/build/build.sh || die
-	default
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	pushd "src/${EGO_PN}"
-	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
-	popd || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	dobin src/${EGO_PN}/${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
--- a/app-emulation/cadvisor/cadvisor-0.35.0.ebuild
+++ b/app-emulation/cadvisor/cadvisor-0.35.0.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/google/cadvisor"
-COMMIT=49033161
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/cadvisor
-	acct-user/cadvisor"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
-	sed -i -e "s/git describe.*/echo ${PV} )/"\
-		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
-		src/${EGO_PN}/build/build.sh || die
-	default
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	pushd "src/${EGO_PN}"
-	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
-	popd || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	dobin src/${EGO_PN}/${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
--- a/app-emulation/cadvisor/files/cadvisor.initd
+++ b/app-emulation/cadvisor/files/cadvisor.initd
@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="cAdvisor - Analyzes resource usage and performance characteristics of running containers"
-pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
-
-command="/usr/bin/cadvisor"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	after net
-}
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@ -1,7 +1,3 @@
-DIST docker-swarm-1.2.5.tar.gz 4619026 BLAKE2B cae94bcb1bbb1f495b18662ac62ad3295d22547b332d6b6c4e55c070650fc3a1c314ef1ef696787b3109c0c5dce3c48979adc85031c0d65834d3d8ff5bd417b3 SHA512 2684c1fbb8e01c062c62137c874825120d0f2da0ca13808c1558ef01680a6f4d77bbff3769d1f59d9bb8011066f202dbb89c23d25597283cc24245db70731992
-DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B ec3eccd5a52442163108c9e8f83e2e7a19ed45438c91e541d75af5cd44f382899098cecc5130c5d36a62ca53f1dc2062a82ec9e04b17e2db835cecdfbaa3b565 SHA512 76d1dfc55ddcbfa0b719d9eb3a75a0c8bc9d2f0308fef391cc59efa7c6b7607860c61c1e77d609d3a2d2cad473da359d0f1df98775a6da791a70d81f98ce5e6c
-DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8
-DIST logrus-0.11.0.tar.gz 24165 BLAKE2B 5d71a4b78d5c46e71401a08d9b0228236f74e864d14206bd6450268a3a41d5f2ac7155c39f250b9906ec132fa63ace6e8888f0ec482ed4a0828696326bbba25e SHA512 ee0b813e277cef0533800a966e6e07884b8de64e75c200439979f00986d84f98cfc750f7d4cb2a2b57d6524941fbba0c6211ce37da50d9a8ca99274f81639620
-DIST logrus-airbrake-hook-2.1.1.tar.gz 3896 BLAKE2B a41877c8201d39f79fd0fabb7bba8d513c14931ab6a2d59b9dbe5907ce32a67d852f8cd25a2ed058ee95d321e430818d5258b4e047f3b809503da58a96bc8876 SHA512 8559f821731ee086a267f43f6e150e18b24a32a2556c45499b2ec42a85642a0581a862fc827b8b9a1949d003b5e36e69972df92a005111b94e2aa9678c336240
-EBUILD docker-swarm-1.2.5.ebuild 2170 BLAKE2B 5f72fefbe686c03f7f55b2b3ba8776f5f010a728004ff957fb36f6ebcbbe243f036fd04cae8f6c6d34b8c96e1f7f3babe9018b5816602a748eae29d35a063c44 SHA512 3a3fbc32ab43fec5e3443022280ff7765d396ec1d06814f66be3eb446f1761b245aa06ee02fe0193b6728719c8fa7908b30c17e85290feab75f27761eb9bfd5f
+DIST docker-swarm-1.2.9.tar.gz 1532493 BLAKE2B 243a3cb6d2e9f719d81947429c6616e93cf1b08187685922ad5daf732e61db12bd626fa26f30174af7e779c8ba45ecce7d2cfb33835ef985bdd57657e30e2228 SHA512 cc0e0e27d0ed4845abd99d1554630cc8e2ab0645d40a76358a83b2ea6d1bc5287dbf5d1aefdd2eb4302aeef3894725e75cae3f5da2353b045492a4357631daa2
+EBUILD docker-swarm-1.2.9.ebuild 1785 BLAKE2B 33249b9b898394ca4abbef4b7391ed75a9dacb691692c1cfae076f67e408df556c7e62788949ac03e457717208eea7a3cd413438bbf9dbfd94c7a517d7f076fb SHA512 69be32a5e547703cdcf9e9e7886339faad7fffd31a530c95c3e9204db915864278b5e37d82d777e35203e4ea0ad1f8fcb051d8615ecc3e822215b7fa74961935
 MISC metadata.xml 303 BLAKE2B 876c526defdc7c039b7923f9860e3fef8bfc3c835e4cc8a50e54ae3ae535c53a27fea39f17a3fbe46939a330e16e9534ebd6ec64d3141075694c4010bb858ef4 SHA512 b724e0dbde2212d3071b201aca8572059e0756f3be2a056097c84ea802ae4365a9682767725a02e3333f5f5cbd31f8e30a0a2b54b3e32619d75fbaa8400a9c22
--- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~amd64"
-EGO_PN=github.com/docker/${PN##*-}/...
-SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz
-	https://github.com/gemnasium/logrus-airbrake-hook/archive/v2.1.1.tar.gz -> logrus-airbrake-hook-2.1.1.tar.gz
-	https://github.com/airbrake/gobrake/archive/v2.0.8.tar.gz -> gobrake-2.0.8.tar.gz
-	https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> logrus-0.11.0.tar.gz"
-DESCRIPTION="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/swarm"
-LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.6:=
-	!!<app-admin/consul-0.6.3-r1"
-RDEPEND=""
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	uri=${uri%/archive/*}
-	case ${uri} in
-		${EGO_PN%/*}*)
-			echo "${EGO_PN%/*}|swarm-*"
-			;;
-		github.com/gemnasium/logrus-airbrake-hook)
-			echo "gopkg.in/gemnasium/logrus-airbrake-hook.v2|logrus-airbrake-hook-*"
-			;;
-		github.com/airbrake/gobrake)
-			echo "gopkg.in/airbrake/gobrake.v2|gobrake-*"
-			;;
-		*)
-			echo "${uri}|${uri##*/}-*"
-			;;
-	esac
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			x=${go_package#*|}
-			go_package=${go_package%|*}
-			mkdir -p src/${go_package%/*}
-			mv ${x} src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	mkdir "${S}" || die
-	cd "${S}" || die
-	unpack_go_packages
-}
-
-src_compile() {
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	[[ -x ${S}/bin/${PN#docker-} ]] || die
-}
-
-src_install() {
-	dobin "${S}/bin/${PN#docker-}"
-	dosym swarm /usr/bin/docker-swarm
-	cd "${S}/src/${EGO_PN%/*}" || die
-	dodoc CHANGELOG.md CONTRIBUTING.md logo.png README.md ROADMAP.md
-}
--- a/app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+KEYWORDS="~amd64"
+EGO_PN=github.com/docker/swarm
+EGIT_COMMIT="527a849cc6b8297690f478905083fc77951da2a7"
+MY_PN=classicswarm
+SRC_URI="https://github.com/docker/classicswarm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Swarm Classic: a container clustering system"
+HOMEPAGE="https://docs.docker.com/swarm"
+LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# It would require internet access to run `go mod vendor`, so
+	# generate approximate go.mod and vendor/modules.txt from the
+	# content of vendor.conf. Use a dummy vendor_version that is
+	# good enough for go to recognize as a valid version.
+	rm -f go.mod vendor/modules.txt || die
+	local x vendor_version=v1.0.0
+	printf -- 'module %s\n' "${EGO_PN}" >> go.mod || die
+	printf -- 'go 1.14\n' >> go.mod || die
+	printf -- 'require (\n' >> go.mod || die
+	while read -r x; do
+		printf -- '\t%s %s\n' "${x}" "${vendor_version}" >> go.mod || die
+		printf -- '# %s %s\n' "${x}" "${vendor_version}" >> vendor/modules.txt || die
+		printf -- '## explicit\n' >> vendor/modules.txt || die
+		printf -- '%s\n' "${x}" >> vendor/modules.txt || die
+	done < <(grep -Eo "^[^#[:space:]]+" vendor.conf)
+	printf -- ')\n' >> go.mod || die
+	default
+}
+
+src_compile() {
+	GOBIN="${S}/bin" \
+		go install -v -work -x -mod=vendor -x \
+		-ldflags "-w -X github.com/docker/swarm/version.GITCOMMIT=${EGIT_COMMIT} \
+		-X github.com/docker/swarm/version.BUILDTIME=$(date -u +%FT%T%z)" \
+		./... || die
+}
+
+src_install() {
+	dobin bin/swarm
+	dosym swarm /usr/bin/docker-swarm
+	dodoc CHANGELOG.md CONTRIBUTING.md logo.png README.md
+}
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@ -8,5 +8,7 @@ AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002e
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
 DIST open-vm-tools-11.0.1-14773994.tar.gz 3972888 BLAKE2B 8ead9b37e9fa861386087d50af4e20274a9ee9fafd929da3ca0652ea2c4eecff4c203cadf02d38401bfd7ff0129ebcc7895d2819785cf2d818aac91a46f8d163 SHA512 3f500b3f0daaed01f787cf271d094b693baa18304491c3b58c79b64ab7db41b1b4a4747440e0039b2d9f9cc7e1474ee15f0ee7413544a34c2c9402443c145276
+DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b SHA512 cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e
 EBUILD open-vm-tools-11.0.1-r1.ebuild 3134 BLAKE2B 424ed232a629c2d8c9d2af5f5cf57c5c686f9dbbc062b2abd208e4d687aea875e753ddefbd417caf9bbabe071167f45591774df667097d7edefde4546fb4b119 SHA512 f64540dfcffe1ee7e0584fb59ace3082544c6f71fa310c2fa4f3ba35440c586da43780e5e5a5cac551cd1781c617b3945e825fcb07fd52f54ad6d6d1703fbfe7
+EBUILD open-vm-tools-11.1.0.ebuild 3146 BLAKE2B c509b879979229195cb42172149e997167c223c84e8dd9087d8a38f8ff028eb0f1418e73639eacdaa79f0f5bc95f1ee020d10ef8d13ab0504a9eada90642c5ba SHA512 270c9bb189641b2a0650195601aebd86cbdbbe8cc1ae15a894e8a8f7ce269d6069cd018843c0ed596ac3581c15e4e6a9e672a162a60f695eb00bc97ee8adeb2d
 MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201
--- a/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
@ -0,0 +1,142 @@
+# Copyright 2007-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="https://github.com/vmware/open-vm-tools"
+MY_P="${P}-16036546"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth"
+REQUIRED_USE="
+	multimon? ( X )
+	vgauth? ( ssl )
+"
+
+RDEPEND="
+	dev-libs/glib
+	net-libs/libtirpc
+	deploypkg? ( dev-libs/libmspack )
+	fuse? ( sys-fs/fuse:0 )
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0 )
+	vgauth? (
+		dev-libs/libxml2
+		dev-libs/xmlsec
+	)
+	X? (
+		x11-libs/libXext
+		multimon? ( x11-libs/libXinerama )
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libSM
+		x11-libs/libXcomposite
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		gtkmm? (
+			dev-cpp/gtkmm:3.0
+			dev-libs/libsigc++:2
+		)
+	)
+	dnet? ( dev-libs/libdnet )
+	icu? ( dev-libs/icu:= )
+	resolutionkms? (
+		x11-libs/libdrm[video_cards_vmware]
+		virtual/libudev
+	)
+"
+
+DEPEND="${RDEPEND}
+	net-libs/rpcsvc-proto
+"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
+	"${FILESDIR}/10.1.0-Werror.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
+	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
+	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
+	kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-root-privileges
+		$(use_enable multimon)
+		$(use_with X x)
+		$(use_with X gtk3)
+		$(use_with gtkmm gtkmm3)
+		$(use_enable doc docs)
+		--disable-tests
+		$(use_enable resolutionkms)
+		$(use_enable static-libs static)
+		$(use_enable deploypkg)
+		$(use_with pam)
+		$(use_enable vgauth)
+		$(use_with dnet)
+		$(use_with icu)
+	)
+	# Avoid a bug in configure.ac
+	use ssl || myeconfargs+=( --without-ssl )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use pam; then
+		rm "${ED}"/etc/pam.d/vmtoolsd || die
+		pamd_mimic_system vmtoolsd auth account
+	fi
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	if use vgauth; then
+		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
+		systemd_dounit "${FILESDIR}"/vgauthd.service
+	else
+		systemd_dounit "${FILESDIR}"/vmtoolsd.service
+	fi
+
+	# Replace mount.vmhgfs with a wrapper
+	mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
+	dosbin "${FILESDIR}/mount.vmhgfs"
+
+	# Make fstype = vmhgfs-fuse work in fstab
+	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+
+	if use X; then
+		fperms 4711 /usr/bin/vmware-user-suid-wrapper
+		dobin scripts/common/vmware-xdg-detect-de
+	fi
+}
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@ -1,5 +1,3 @@
-DIST slirp4netns-1.0.0.tar.gz 51919 BLAKE2B 9d2d95de80e644981f185a6c243949e55761b25cb908c1ee727f06264d08e794e8228a197e0cc858f81f582d3ddb349c5d6cd2566944c63f41299fb2a5a0d3d2 SHA512 fe0256f0b91647b361999915c6c2b975ee33c437afef3cf490f5e33f582da4db97e360e86654831d7e9b2a8b0d78c91080874a9377247693ac54ffdb60ca6fb9
 DIST slirp4netns-1.0.1.tar.gz 51911 BLAKE2B d125dd2c24fd7a817d2b8f16c6bac66399a4a0f37c49d43541f336e7ff09673bca2d6ed2c62cc856034b8e2f6e11ac1ff3753d3546148e68ddf085e8b9aca354 SHA512 4947e32d88c3c8f1b7b2e94a1e73041a48cc8ddf75ffaf691d44cb6ebeaef5cf0b0abb7a8df8919682dfc854a76d73fc5bdebcf01b3ace97be187068d704bf63
-EBUILD slirp4netns-1.0.0.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2
-EBUILD slirp4netns-1.0.1.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2
+EBUILD slirp4netns-1.0.1.ebuild 942 BLAKE2B 970fc2e131a194f9387230c3ce6b2516797f9cf72a0e9a7456068716cc3cff9cad4df827b55f751b44497a253eba9566bd3b175963c28f4fa7c3637553560f15 SHA512 340f4ec282e903a44770c10b7b74580bf14562f627a8fcf53b148a37d55ea85da8849960a9ebcd69a146f7a9ee1fe95c87a374c36da32149234a9eef0a86aa2b
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
--- a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
--- a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"

 src_prepare() {
+	# Respect AR variable for bug 722162.
+	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
+		-i configure.ac || die
 	eautoreconf
 	default
 }
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -1,16 +1,16 @@
 DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
-DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98
 DIST wine-5.5.tar.xz 23630916 BLAKE2B 52855c891bb2f6431d0cb02e7b64b28525ad952b548771dd7ff89f95842f9f8e27c941cef7e963b8fb4c7d84c6fd28dba8edfbab90ba683b9f32c41583837e0a SHA512 9c7870dd829effe5fd1be342f85a85e2d1f791bfd871279253dd91becd97dea41c6c4f7a9faec0153e58e360d4e3b4d659daf0d21f07a142d06534e0c229aacd
 DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4
 DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407
-DIST wine-staging-5.4.tar.gz 9924147 BLAKE2B c82fa66470645e62e63e8760d68cb92e4a04c209db712371bc1a534756c6b16c109e247bb1866edc514bdb24ba6a9e9f4ccb5c0db204d51541da0af82fd3b96f SHA512 d4958e73cea34a4a722f516487116d9f77a22099cb80b9c79f2468fbe28855acec131dacecfd255a9934fb88bcf34809bfb2e2e518d89ac23bcae125b6d6c86b
+DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
 DIST wine-staging-5.5.tar.gz 9920540 BLAKE2B 21b24fd3a2b3ee9c9ea029e1114d0faaf0b8a4ef732eafb4f7e0301886aee9160699867147c4087515a37edc57a42919c662b1e203bf9df674d78579b3be3c39 SHA512 8e926d73f275ed36b1c1e55235831c171b427501265a0e859accc7ca6b5077513bc2b3d37d973842b76b57a56798d11c101a387c626c96ed422d8a06cd908221
 DIST wine-staging-5.6.tar.gz 9922611 BLAKE2B 945e7a6398d6f3f8f85f334a06462282647405cf0b7d0e9d1985c9c5daa460c1bb9f8dc66d090311aeb8136d0603e836084bbeb2904833f4f73d7fdd9dd9bef1 SHA512 7ddf5699834a6e04b094a7cae008175c874415d22554bac38176f3121b9533071ef610f8b5a0dd3ce3e4adf8a9d4ac214aa1cee7634959c5150b66fbb74710b7
 DIST wine-staging-5.7.tar.gz 9913511 BLAKE2B f5d803a067ec61c5d698d7ebf0623b55f0e4fee487e6fcfb4de057d742ff4d55bf184004c4427e8b93052efa74fe9e14da2a41a826c79a0c62ef25de7b6e10ef SHA512 042bcf7b90769c9d88d5cd844009301fb768568ee10ebf7aed9c3397ca35f6d6b512db2010917695f32bed9edf174d95f80a141d5af75a43871444b1830f2922
-EBUILD wine-staging-5.4.ebuild 20270 BLAKE2B bb01e66fa3f2e2e91a44caad8388be624e82b0fc23a7eac2634299a4da8ed6396f54523ce62aaddeb00eb9b066789fd44e8398a66990c4a9d87eac5dc008e3a6 SHA512 1f45e12c8a69436751b733bd35c7737ded4a188a487c42aeb5e8169b7c49b56ccee862d96104125a751c766264b9f7ef5d5ead3e84857c19c689baf3c31fa60e
+DIST wine-staging-5.8.tar.gz 9878712 BLAKE2B a96f7e4aa1d1dddcda1a9d6a30ab3b564fb365a09efde22e5b7abab1ac015da0bc242b2fec6d4ae14dc5ddad38e3314a5f8c430e6eb10853ed8619e805bf5787 SHA512 3ea2a90ab0613b680274c95cf7ef3d3a7d807571fb792e05fc1df9bbd7a35c80a0d7c38342fea8858c5557ae3f12287a7ce09d0cdab5064000b79ec6c891ad15
 EBUILD wine-staging-5.5-r1.ebuild 20395 BLAKE2B 47e075b9a1f7413f49f19ed5c8fcc96cad55f35644c9f6e6a00c462f3a8f590c5fcc9c73a71702bff6eba9610f01559e80279a052e6e91c205da9bf4b759a8bf SHA512 38042be6ac2926a8cb870e8f52a9e3e6b07ee3cc27d72e81329e47fe3c4c66569b5440ecb9f7e767d67e67e4ba5453680ff014a6b392f7a9884b8faff7a67341
 EBUILD wine-staging-5.5.ebuild 20351 BLAKE2B e02469f34ecdcfd3840afdd74ccba9e07c04fa103bf3fab37643918ce353bff2b5a93031f66b66287d001838732f00a62ef1e3528c99c9aede262c6536af0f56 SHA512 17c45c016054ef4b14ec628e873f1e5447cb79a35bc6b78b0f40e33dc9f08fb778845786e2e85fdb949ed3c38b196f23817fa3cf136688f2d16246b96efe09cd
 EBUILD wine-staging-5.6.ebuild 20335 BLAKE2B 6455afc8ce78bfe296010d7901198d43aa57c1a8a82e6d538f457d6e7e970478c30c3781f010e8d378aa913e3653777a598842563aceedfd1a51116fb25304c7 SHA512 4181eba5382b2c357cf22d6df059cdf2e747dd86c279dd64e2e79a66e23b45621d1f985da13585bb5aa31ed27652ed1859958b77a492aa21c48e59a132f50167
 EBUILD wine-staging-5.7.ebuild 20335 BLAKE2B b72f4a198a4624222653084b047027cd4d0d376016ea8f903d63355c4b98df48bddafdb52ed43b885265b8496f8ad89c849c456fee9943c17d4a004a11fd8176 SHA512 200aba15c914656205ab9f56e8eca057f3c54a8da6fde14ddcde5a5d5168585720080258661b01a845fd75cbe3743433cdd073986de4dc91ea5d04000f06b2d7
+EBUILD wine-staging-5.8.ebuild 20335 BLAKE2B b72f4a198a4624222653084b047027cd4d0d376016ea8f903d63355c4b98df48bddafdb52ed43b885265b8496f8ad89c849c456fee9943c17d4a004a11fd8176 SHA512 200aba15c914656205ab9f56e8eca057f3c54a8da6fde14ddcde5a5d5168585720080258661b01a845fd75cbe3743433cdd073986de4dc91ea5d04000f06b2d7
 EBUILD wine-staging-9999.ebuild 20335 BLAKE2B b72f4a198a4624222653084b047027cd4d0d376016ea8f903d63355c4b98df48bddafdb52ed43b885265b8496f8ad89c849c456fee9943c17d4a004a11fd8176 SHA512 200aba15c914656205ab9f56e8eca057f3c54a8da6fde14ddcde5a5d5168585720080258661b01a845fd75cbe3743433cdd073986de4dc91ea5d04000f06b2d7
 MISC metadata.xml 3813 BLAKE2B de077c2b962c962401ae0922aa8a244f08db7a5f0773d8d1466497dd3d2cd6e8b60186c5025f0806b49238266117035986df25c9c939fb9d9ec98ac7af5ebbf4 SHA512 edac5258e3d47f8c0285eb382cb5209996630bd65722c864a2b548dad09d72073d1c3e797fdda0f0cbf46bb87abbc5cbf1020fec2984b08c164d019a90fc4902
--- a/app-emulation/wine-staging/wine-staging-5.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.8.ebuild
@ -44,7 +44,7 @@ fi

 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@ -112,6 +112,7 @@ COMMON_DEPEND="
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
 	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
@ -129,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.4 )
+	mono? ( app-emulation/wine-mono:5.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -165,7 +166,6 @@ usr/share/applications/wine-winecfg.desktop"
 PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 )
 PATCHES_BIN=()
@ -353,7 +353,7 @@ src_prepare() {
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."

-		local STAGING_EXCLUDE=""
+		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"

 		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
@ -473,6 +473,7 @@ multilib_src_configure() {
 		$(use_enable test tests)
 		$(use_with truetype freetype)
 		$(use_with udev)
+		$(use_with unwind)
 		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -2,15 +2,15 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
 DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
 DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
 DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
-DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98
 DIST wine-5.5.tar.xz 23630916 BLAKE2B 52855c891bb2f6431d0cb02e7b64b28525ad952b548771dd7ff89f95842f9f8e27c941cef7e963b8fb4c7d84c6fd28dba8edfbab90ba683b9f32c41583837e0a SHA512 9c7870dd829effe5fd1be342f85a85e2d1f791bfd871279253dd91becd97dea41c6c4f7a9faec0153e58e360d4e3b4d659daf0d21f07a142d06534e0c229aacd
 DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4
 DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407
+DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
 EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05
 EBUILD wine-vanilla-5.0.ebuild 17490 BLAKE2B 99c20620e3a74afb13605a253695de535a1fb09afd3c79c12769379993cceb2cfd387433023c7a45bb265df77eac933e3edd31fdf5e36cc7eefc28b96abd7924 SHA512 229049df1bfe362260b46a71608010be777ca26de04340aa465f6675c1e249d5e8a2b9d5f7b42c9ab55207d90bca3fd1bb6625ba5e1d27ed2993cf3b4176be0b
-EBUILD wine-vanilla-5.4.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22
 EBUILD wine-vanilla-5.5.ebuild 17635 BLAKE2B 009a63dfe37b6e32a6363be4c9965c883b99d4274bf98f3773f97c50252fb5323311a3914f747ae64d33a5f401792234746fc6f4fa0014a0c37def48f1b89d18 SHA512 40b910b12a756b0fa671b2b87a2d59befcb2cfb4c76c55428039265a6319a7893bb3a3016b8e932dc2906ce86ea21ac0bf40b18c6b3a85ecd3f0594b01f8bdce
 EBUILD wine-vanilla-5.6.ebuild 17575 BLAKE2B caa74ad628520bd34a659b9c9f453fd62c8abb0c1d2714cc0d9ebcffa6fa876ca1c993978187bbc9c5cf455493cd01294d957bd235d3e046dba55843d2cb458e SHA512 9dda07ac24cd60bd4eaf15e51c8dca22281059bd43cb71571476d5d27e83bade73a4826c1f118709430e625c40666b8dae16ab4c0d5b1e52109d509d911299b8
 EBUILD wine-vanilla-5.7.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
+EBUILD wine-vanilla-5.8.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
 EBUILD wine-vanilla-9999.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
 MISC metadata.xml 3342 BLAKE2B a4be85e6b184b90e008d8beed5aabda03e9a378c5b348bcbdb98d8dcac52328915a39483943ab799abab49b755e36782bab1103400c4e40186da44abe40e4e47 SHA512 45f4066692fc4ff90124233313bc4804530925936aa260051f51558fed031de421b1c3d6941126733dc21d6b13a7821af4676333f25ef4eab355e170005ca444
--- a/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}

 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@ -93,6 +93,7 @@ COMMON_DEPEND="
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@ -109,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.4 )
+	mono? ( app-emulation/wine-mono:5.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -141,7 +142,6 @@ usr/share/applications/wine-winecfg.desktop"
 PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 )
 PATCHES_BIN=()
@ -406,6 +406,7 @@ multilib_src_configure() {
 		$(use_enable test tests)
 		$(use_with truetype freetype)
 		$(use_with udev)
+		$(use_with unwind)
 		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@ -1,5 +1,6 @@
 AUX foremost-1.4-config-location.patch 462 BLAKE2B 7dadc7fd049b09992e9e3019aaaa27d53268a6b6cea03146d965bdd3f0ec3165fbde33c2ecd41a949758ff4b8d36259d048869d17b828e2f600ea9418e3d0bce SHA512 7b6dcc18cba4676ef4d54b87c9c31747754ecbebd9424340b2dd059495c9c6cec11513307fff802a336a99bc07c4bcd2ffcfad1c77ccdc49277ef7e40e30029e
 AUX foremost-1.5.7-format-security.patch 680 BLAKE2B 5565dc9d255ccbb4b721cdb0b41fef4f86369c4965000e35678e6ece00acec5ead0b15d90bd71a2456b812ab74fa9283bdf70c2fc36003a3d659105bb04a139d SHA512 1c28ed1fceedec728a5060b195214fd3ec3b0fa529e87f7421ee72d73f71ecc0d48a69a5b5ff4c6179dd65781552fbd272437134498ec865bd5c620375b6f85b
+AUX foremost-1.5.7-set-but-unused.patch 7720 BLAKE2B 047c4a31d26750706a9dad36078e848e68e89f0013a6572369dc42fa014234d37120bdb3c51ec7e83b7c99d4c497c541039e334af1d3bd144cf8250a1212f920 SHA512 1be57b3a63e38556b3a6758c1f24e5424076f11608dba148703c9cef16bac9954366a2540720912e8720d0e291f6d5933f2830b0f1b497a5f6feabc570231a52
 DIST foremost-1.5.7.tar.gz 52352 BLAKE2B 5642c1afd86aab0a2f90986c3b030d37b37700c5d0e4b04e4f4a2004d69745280fabd4086a72c33b9eab05b57d125d6b11105c9e11b0112e30077f101eeab7ac SHA512 8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab
-EBUILD foremost-1.5.7-r3.ebuild 884 BLAKE2B ce1257966c1b49fdfa9272c165d34d18915300a2a2e24a5eb52111d990d7aad3e7a7eab726ef6e7a45b29a6bf5a8dfa88ae128f155c7227d837d3108467cb6ce SHA512 f900a27bcb24e414f194955c047b6c634a4e9463121ce3dea336e642d36aed94be30a0633e6a71aac8b221e8f0ae9af893dd6d76206cff7d6a847773fef96dcc
+EBUILD foremost-1.5.7-r3.ebuild 889 BLAKE2B 4c6efebcd368b06250afef4a665ce84e7538eeb82a83988b148f1e2ef3fa94e769d7172b05d78156488e1e066aa2fa927a5fd0b8f3073cc7a754f0793d2e08fd SHA512 b1156aeeeef8718e631fc9e24a030a2191951238a76da2754e52ed62f35084294517f40c2809d2466953cfd5a723d71bf5497ed44726a0723df8b30d4b6d17ef
 MISC metadata.xml 303 BLAKE2B 14bc09979926d326ccb75438d8e32f9a60b1df8078e6344f4dc2e32a33c0994bf2740a4b29d7c1a479bb514815f037d2d9a9ac9c8387fbc01b7795e2a37fea86 SHA512 165c108232c3a65d3fbeb0fb2f612c7c4c4c16a57e4b3e280c4ef40d6a586b56df437454283ff5b52fa3a0880d9643682493b3d75cac01170edab53bb5f1ce52
--- a/app-forensics/foremost/files/foremost-1.5.7-set-but-unused.patch
+++ b/app-forensics/foremost/files/foremost-1.5.7-set-but-unused.patch
@ -0,0 +1,230 @@
+diff --git a/api.c b/api.c
+index e3ee339..67463a6 100755
+--- a/api.c
+++ b/api.c
+@@ -478,7 +478,7 @@ int dump_dirent(int which_one)
+ {
+ 	int				i;
+ 	char			*p;
+-	short			unknown;
+	// short			unknown;
+ 	struct OLE_DIR	*dir;
+ 
+ 	dir = (struct OLE_DIR *) &buffer[which_one * sizeof(struct OLE_DIR)];
+@@ -493,7 +493,7 @@ int dump_dirent(int which_one)
+ 	p = dir->name;
+ 	if (*p < ' ')
+ 		{
+-		unknown = *((short *)p);
+		//unknown = *((short *)p);
+ 
+ 		//fprintf (stderr, "%04x\t", unknown);
+ 		p += 2; /* step over unknown short */
+diff --git a/engine.c b/engine.c
+index 85add5f..4a1ef13 100755
+--- a/engine.c
+++ b/engine.c
+@@ -316,7 +316,6 @@ int search_chunk(f_state *s, unsigned char *buf, f_info *i, u_int64_t chunk_size
+ 	//u_int64_t               buf_off = 0;
+ 
+ 	unsigned char	*foundat = buf;
+-	unsigned char	*current_pos = NULL;
+ 	unsigned char	*header_pos = NULL;
+ 	unsigned char	*newbuf = NULL;
+ 	unsigned char	*ind_ptr = NULL;
+@@ -461,7 +460,6 @@ int search_chunk(f_state *s, unsigned char *buf, f_info *i, u_int64_t chunk_size
+ 				}
+ 
+ 				c_offset = (foundat - buf);
+-				current_pos = foundat;
+ 
+ 				/*Now lets analyze the file and see if we can determine its size*/
+ 
+@@ -511,12 +509,12 @@ int search_chunk(f_state *s, unsigned char *buf, f_info *i, u_int64_t chunk_size
+ 						newbuf = read_from_disk(c_offset + f_offset, i, needle->max_len);
+ 						if (newbuf == NULL)
+ 							break;
+-						current_pos = extract_file(s,
+-												   c_offset,
+-												   newbuf,
+-												   needle->max_len,
+-												   needle,
+-												   f_offset);
+						extract_file(s,
+								   c_offset,
+								   newbuf,
+								   needle->max_len,
+								   needle,
+								   f_offset);
+ 						
+ 						/*Lets put the fp back*/
+ 						fseeko(i->handle, saveme, SEEK_SET);
+diff --git a/extract.c b/extract.c
+index 9639117..4fecde5 100755
+--- a/extract.c
+++ b/extract.c
+@@ -553,7 +553,6 @@ unsigned char *extract_htm(f_state *s, u_int64_t c_offset, unsigned char *founda
+ {
+ 	unsigned char	*buf = foundat;
+ 	unsigned char	*extractbuf = NULL;
+-	unsigned char	*currentpos = NULL;
+ 
+ 	int				bytes_to_search = 0;
+ 	int				i = 0;
+@@ -582,7 +581,6 @@ unsigned char *extract_htm(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 		}
+ 
+ 	/*Store the current position and search for the HTML> tag*/
+-	currentpos = foundat;
+ 	foundat = bm_search(needle->footer,
+ 						needle->footer_len,
+ 						foundat,
+@@ -1146,15 +1144,15 @@ unsigned char *extract_mov(f_state *s, u_int64_t c_offset, unsigned char *founda
+ unsigned char *extract_wmv(f_state *s, u_int64_t c_offset, unsigned char *foundat, u_int64_t buflen,
+ 						   s_spec *needle, u_int64_t f_offset)
+ {
+-
+-	unsigned char	*currentpos = NULL;
+#ifdef DEBUG
+	u_int64_t			fileObjHeaderSize = 0;
+#endif
+ 	unsigned char	*header = foundat;
+ 	unsigned char	*extractbuf = NULL;
+ 	unsigned char	*buf = foundat;
+ 	unsigned int		size = 0;
+ 	u_int64_t		file_size = 0;
+ 	u_int64_t			headerSize = 0;
+-	u_int64_t			fileObjHeaderSize = 0;
+ 	int				numberofHeaderObjects = 0;
+ 	int				reserved[2];
+ 	int				bytes_to_search = 0;
+@@ -1184,7 +1182,6 @@ unsigned char *extract_wmv(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 		return foundat;
+ 		}
+ 
+-	currentpos = foundat;
+ 	if (buflen - (foundat - buf) >= needle->max_len)
+ 		bytes_to_search = needle->max_len;
+ 	else
+@@ -1201,7 +1198,9 @@ unsigned char *extract_wmv(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 	if (foundat)
+ 		{
+ 		foundat += 16;	/*jump to the headersize*/
+#ifdef DEBUG
+ 		fileObjHeaderSize = htoll(foundat, FOREMOST_LITTLE_ENDIAN);
+#endif
+ 		//printx(foundat,0,8);
+ 		foundat += 24;	//Jump to the file size obj
+ 		size = htoi(foundat, FOREMOST_LITTLE_ENDIAN);
+@@ -1401,7 +1400,6 @@ unsigned char *extract_gif(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 						   s_spec *needle, u_int64_t f_offset)
+ {
+ 	unsigned char	*buf = foundat;
+-	unsigned char	*currentpos = foundat;
+ 	unsigned char	*extractbuf = NULL;
+ 	int				bytes_to_search = 0;
+ 	unsigned short	width = 0;
+@@ -1420,7 +1418,6 @@ unsigned char *extract_gif(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 		sprintf(comment, " (%d x %d)", width, height);
+ 		strcat(needle->comment, comment);
+ 
+-		currentpos = foundat;
+ 		if (buflen - (foundat - buf) >= needle->max_len)
+ 			bytes_to_search = needle->max_len;
+ 		else
+@@ -1821,7 +1818,6 @@ unsigned char *extract_jpeg(f_state *s, u_int64_t c_offset, unsigned char *found
+ 							s_spec *needle, u_int64_t f_offset)
+ {
+ 	unsigned char	*buf = foundat;
+-	unsigned char	*currentpos = NULL;
+ 
+ 	unsigned char	*extractbuf = NULL;
+ 	unsigned short	headersize;
+@@ -1899,8 +1895,6 @@ unsigned char *extract_jpeg(f_state *s, u_int64_t c_offset, unsigned char *found
+ 		return buf + needle->header_len;
+ 	}
+ 
+-	currentpos = foundat;
+-
+ 	//sprintf("Searching for footer\n");
+ 	if (buflen < (foundat - buf)) {
+ #ifdef DEBUG
+@@ -2094,19 +2088,21 @@ unsigned char *extract_exe(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 	unsigned char	*extractbuf = NULL;
+ 	u_int64_t		file_size = 0;
+ 	unsigned short	pe_offset = 0;
+-	unsigned int	SizeOfCode = 0;
+-	unsigned int	SizeOfInitializedData = 0;
+-	unsigned int	SizeOfUninitializedData = 0;
+-	unsigned int	rva = 0;
+ 	unsigned int	offset = 0;
+ 	unsigned short	sections = 0;
+-	unsigned int	sizeofimage = 0;
+ 	unsigned int	raw_section_size = 0;
+-	unsigned int	size_of_headers = 0;
+ 	unsigned short	dll = 0;
+ 	unsigned int	sum = 0;
+ 	unsigned short	exe_char = 0;
+#ifdef DEBUG
+	unsigned int	SizeOfInitializedData = 0;
+	unsigned int	SizeOfUninitializedData = 0;
+	unsigned int	SizeOfCode = 0;
+	unsigned int	rva = 0;
+	unsigned int	sizeofimage = 0;
+	unsigned int	size_of_headers = 0;
+ 	unsigned int	align = 0;
+#endif
+ 	int				i = 0;
+ 	time_t			compile_time = 0;
+ 	struct tm		*ret_time;
+@@ -2167,14 +2163,16 @@ unsigned char *extract_exe(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 
+ 	foundat += 0x18;	/*Jump to opt header should be 0x0b 0x01*/
+ 
+#ifdef DEBUG
+ 	SizeOfCode = htoi(&foundat[4], FOREMOST_LITTLE_ENDIAN);
+ 	SizeOfInitializedData = htoi(&foundat[8], FOREMOST_LITTLE_ENDIAN);
+ 	SizeOfUninitializedData = htoi(&foundat[12], FOREMOST_LITTLE_ENDIAN);
+ 	rva = htoi(&foundat[16], FOREMOST_LITTLE_ENDIAN);
+ 	align = htoi(&foundat[36], FOREMOST_LITTLE_ENDIAN);
+-
+ 	sizeofimage = htoi(&foundat[56], FOREMOST_LITTLE_ENDIAN);
+ 	size_of_headers = htoi(&foundat[60], FOREMOST_LITTLE_ENDIAN);
+#endif
+
+ 	foundat += 224;
+ 
+ 	/*Start of sections*/
+@@ -2193,13 +2191,13 @@ unsigned char *extract_exe(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 		sum = offset + raw_section_size;
+ 		}
+ 
+-	/*
+#ifdef DEBUG
+     printf("rva is %d sum= %d\n",rva,sum);
+     printf("soi is %d,soh is %d \n",sizeofimage,size_of_headers);
+     printf("we are off by %d\n",sum-buflen);
+     printf("soc=%d ,soidr=%d, souid=%d\n",SizeOfCode,SizeOfInitializedData,SizeOfUninitializedData);
+     printf("fs=%d ,extr=%d\n",SizeOfCode+SizeOfInitializedData,SizeOfUninitializedData);
+-		*/
+#endif
+ 	file_size = sum;
+ 	if (file_size < 512 || file_size > 4 * MEGABYTE)
+ 		{
+@@ -2267,7 +2265,6 @@ unsigned char *extract_rar(f_state *s, u_int64_t c_offset, unsigned char *founda
+ {
+ 	unsigned char	*buf = foundat;
+ 	unsigned char	*extractbuf = NULL;
+-	u_int64_t		file_size = 0;
+ 	unsigned short	headersize = 0;
+ 	unsigned short	flags = 0;
+ 	unsigned int	filesize = 0;
+@@ -2424,8 +2421,6 @@ unsigned char *extract_rar(f_state *s, u_int64_t c_offset, unsigned char *founda
+ 
+ 		/*We found the EOF, write the file to disk and return*/
+ 		tot_file_size = (foundat - buf);
+-		if (tot_file_size > buflen)
+-			file_size = buflen;
+ 
+ 		extractbuf = buf;
+ 		write_to_disk(s, needle, tot_file_size, extractbuf, c_offset + f_offset);
--- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -15,12 +15,9 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4-config-location.patch"
-	epatch "${FILESDIR}/${PN}-1.5.7-format-security.patch"
-	default_src_prepare
-}
+PATCHES=("${FILESDIR}/${PN}-1.4-config-location.patch"
+		"${FILESDIR}/${PN}-1.5.7-format-security.patch"
+		"${FILESDIR}/${PN}-1.5.7-set-but-unused.patch")

 src_compile() {
 	emake RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@ -20,5 +20,5 @@ EBUILD sleuthkit-4.6.6.ebuild 6879 BLAKE2B b39fd3fe82839ae23bb6ef43c13c3bc146b43
 EBUILD sleuthkit-4.6.7.ebuild 6809 BLAKE2B ad038763c9c1c8b9eb5b96b2eac68a8ed0b6cc92179a7b980e091b2e91f8f83490279b5c314c9e03d60eb8e4465fd94b415f1df7d909349b8c63c463c07b071f SHA512 c9207604973caf8f8fd4ee99313bf38b6b7c67c707e266cad06888c66dd3657598f23f34c39142648d1d40fe83e7a87b7d23201e5d3f5e7bd7dcb51b14bca73b
 EBUILD sleuthkit-4.7.0.ebuild 7483 BLAKE2B 57b1094cf98aaac26a8f5ed1f455e9957b022cd782e9eecb440bef39205b5488f091367f2c4965be941b33741775c1e1376c9c44542ffc06240bfa66d8324a58 SHA512 781bef3bbdb7ec31e56170097836d9d0146c347f8c75de953f29a3a33f24c209dae38c09d5e76927113d5abfc2ef046cfed3b903e8218ec3d78d416a843ac5ee
 EBUILD sleuthkit-4.8.0.ebuild 7691 BLAKE2B c22eed13d47a957ad1f203da415f2a733c35127d8c90dd4ffafddce90ad70b8f208a7023816ee907129f7220df3f8a2e1fee3d21ab916129101b3f640ac8c866 SHA512 20b3482a5a5206671063db42fc2d2560e4aee91c02086128a22997cd1f15babbc43710ec1637bc8800b5e81f02452c97f1e67398df39d7a2632c14890dbc8983
-EBUILD sleuthkit-4.9.0.ebuild 8268 BLAKE2B dd8bd14daae00da6325688ca61bbd98f617d44a5cd4876fe034962f73a029d3e777ff4960e2950cafb01b052c5f79e30dad1fbb23b0ca72b2f51cb2dde1992e2 SHA512 d57d706a08914a17b19917245a12625a7496a4c02c4aac16a145c87be6672a95dc99571fb9010983dd62e5ec28cc6309b28be0213f96db860282a4bd9ddece6a
+EBUILD sleuthkit-4.9.0.ebuild 8267 BLAKE2B eea48cda7dd8453bec8c0c9fb77ab00188aa66c0804a084a03d0f1db12d7eae13c05447cf0f18bb94b3e4586b3a4f3e8680d82025fdc8f22c90d40789981628f SHA512 a9d4148c744203cd5448e1f60d727c206b5cc388ecc330209b034eb78f9cd5cc6d1a7acabc96a3eb07fcd69128546fafe7aea86802852cb3b198b0c70f572280
 MISC metadata.xml 607 BLAKE2B 2c651da1253ec986eb766b6949ea9a9059d76351081e805aba5f795971bb3b9368987cc9d39fc335c1e65c12de9347471686984e2753487cafab431488762064 SHA512 2dbce141f133a9172c6ba61924a9fac2674394096063b899be5a90111a9741789e2a09aa06cc49e17a253d088d20c1ddad1c748b6e09f650131ec0f91116ae08
--- a/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild
@ -37,7 +37,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz

 LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
 SLOT="0/13" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~x86"
 IUSE="aff doc ewf java postgres static-libs test +threads zlib"
 RESTRICT="!test? ( test )"

--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
 DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
-EBUILD ibus-typing-booster-2.7.0-r1.ebuild 917 BLAKE2B e07904b632e185636e3c5dbbbfbb3d72723866022f04aa7abe7d00411779c57639d47c07b34e2b33eef0418b67515f94d53afaff2a4e9a55c0b1d4b4289fac41 SHA512 a2b0451ed29c1dc573b3f4158c9c19fc47f7ab46cfae0b614cd10ede3c3952380deb148039ef24674aa1e627631503ffc9876916bc25af12a618d2f416d8ff7b
-EBUILD ibus-typing-booster-2.8.0.ebuild 915 BLAKE2B 8505c9546d6f07fe6c7fe641ac3cc973eb27ed681dceeca9091659d984d8bcc7285568005b46726448447d50bcf3540acacdb330cbd20c7cf49d43cb361365f4 SHA512 23e841de462df06e7f41a96271b027af87b2024cefd0e82f15535a91ecb72639ba5d54802a0b7860f354d4e3ddbc27a8eac29194188cc173e7ccd38f9685d987
+DIST ibus-typing-booster-2.8.2.tar.gz 8161995 BLAKE2B 79c7bacb7c5a07139c710ddf063b58ed6bc15d1f58529dfaa0d8f1935cb513fe27ad5e95af0ca7383922f5642d1197cf74183ba2463a3fa81637add5d8376691 SHA512 3dffc21aae59ebc8c7b3ef3df588f958b4a42a2025dc6a82613e9bb1b324f8c999d01b8d98ed48794b3ea8fd5c3221df489a88f8c54c154a69be9908beda85b5
+EBUILD ibus-typing-booster-2.8.0.ebuild 904 BLAKE2B 2342c11d4ed30313c166d1860b16f1a9ad0fb93898290041a0ac5e9c1974c5210d29f6590b251ee72d6074b648357ae6f0e1a72b0af80d8d42e3a23f9c1759ed SHA512 eb48fb3e05cbea35d04bfd521d6b3d941c095e5b1a1446d204dd7fcd4cf6464d62e002eea446749177270b564abf9cad5a6dbd3cc4e311152f0eeaa1e3e89340
+EBUILD ibus-typing-booster-2.8.2.ebuild 904 BLAKE2B 2342c11d4ed30313c166d1860b16f1a9ad0fb93898290041a0ac5e9c1974c5210d29f6590b251ee72d6074b648357ae6f0e1a72b0af80d8d42e3a23f9c1759ed SHA512 eb48fb3e05cbea35d04bfd521d6b3d941c095e5b1a1446d204dd7fcd4cf6464d62e002eea446749177270b564abf9cad5a6dbd3cc4e311152f0eeaa1e3e89340
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite(+)"

 inherit python-single-r1
@ -18,7 +18,7 @@ IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

-CDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	dev-libs/m17n-lib
 	$(python_gen_cond_dep '
 		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
@ -27,8 +27,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 	')"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite(+)"

 inherit python-single-r1
@ -18,7 +18,7 @@ IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

-CDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	dev-libs/m17n-lib
 	$(python_gen_cond_dep '
 		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
@ -27,8 +27,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 	')"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@ -5,5 +5,5 @@ AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f
 DIST collectd-5.10.0.tar.bz2 1856377 BLAKE2B d4c011c5d2d9bfcf8400a35ca92f0b8c82fd58c3201b1b57a6b48c98af63efaab03c5fb1144bae28e7661743626871eaa962959929ff7fcdd5778b72c7054c4e SHA512 1296085fb19bba0c7b7d8684ec877851158b25c9f7b58fc3ae602fba7d7dc718876e730e1cdba96d39101cc5452705bb3445aaee717b219025ae816299b6a3c5
 DIST collectd-5.11.0.tar.bz2 1851663 BLAKE2B b07c727ed553b3d11967da734a98fda753794be199377b08a2780b7d3f79acef345f160d930dda68cd12aa0949bbc0aee6ca5e7ae01e16a5e392a4a73e272d1d SHA512 87671545e3d01770c204ba4439265d1c0add6a105bf04ff02dc04db3731fd933d32ecb9b0dc15f2e504d70c3e421a64cf19728c897aa4fb1fda86e393ffc15bf
 EBUILD collectd-5.10.0.ebuild 19527 BLAKE2B bf575f7baf55daa3cffaa4364314173633953fc000c5e3b8e7d148dff55b1682add29042fe2e0822dc8083ebd7fa255515f3f79f3f5f841741633af224918705 SHA512 e6b7526484732b452eba2d39d23e37e97b75a077531584abd00c544f0c935e7324988a96bf991fa403dfb2b757b63dc71026f2a4d864f2abe500d95776913c5f
-EBUILD collectd-5.11.0-r1.ebuild 20057 BLAKE2B 9fc4e5168a4503d06a8bd89a79c46c1b3facfd6db54cfec0881c546975cf244f434dda6de85fde616f02a5d4a6a3d9a9d60645348765602f21d5e68bff4b81d6 SHA512 5d1c5ed6c79cda99bc856d722b39134e1aaa7769575964b03b552331304416d5dc69c42d6b0041f0afa4cef7ee10c3599890d69ec135f8e925a168f24bfddb07
+EBUILD collectd-5.11.0-r2.ebuild 20112 BLAKE2B 000f4fa19daedd49bad9b7505c87b18c6ef6b277503fffb0a3c7e534b077cb68a745e32220d4936241aa816b7f04f41d581b37631b55d7bca33ff5afe02e07ca SHA512 05acb7c3fb06fc0987ea64206f12cf10f336b03eb52ab646770ac945241c132fdcb52f91d1a9a94862fb13634c0fb886954ab227e1157a956138cc939f191991
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
--- a/Show more
+++ b/Show more