gentoo resync : 25.04.2020

25 files changed, 287 insertions, 44 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 654a91c48a09..8a034918840c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index f6b4a4c22011..e13074ded86c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -391,15 +391,15 @@ DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e914
 DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
 DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
-EBUILD bash-2.05b_p13.ebuild 4599 BLAKE2B c91f4240977a878fb3fcdaf0fc3bc77ff19fb4db77e98048eece13a432952ad3ac0aa387810bd91f7ec3cdebd2d3ff4bae2a8c0f250672f2821671b43fa92ffc SHA512 ed510ffed067978d263e21b8db7bca758dedb3782ba0ded76141803c213582c9760c586147a4aa32070c5bbe7769db750d1dce6ef3a483c33bad8b8d6a5bc9a2
-EBUILD bash-3.0_p22.ebuild 4732 BLAKE2B 08d496770a205201da2ea69828d8e8a9728609e98788b394b40abcc0dadddc006c164bfcca7621dc151581c20775a3d851557e9510f58a24c1dcde1897e09a49 SHA512 6756d1b615c98a037201bfa8c2e6936d57fea747a78cc4ff1c8162a24174863eb4abb96a67b4e3bcb0da842dbb82ef0633a5e3fb1c6db89a450d75a9b8d58db9
-EBUILD bash-3.1_p23.ebuild 4413 BLAKE2B 82e65d976dfcc8d667dfd0041f260f2f4ba66e978c1f5c49a7c6ced1b83b1f09a854e811c6b8f53b20ecd7752a2528b03c12e7c14ef39804ad43f23fa8324303 SHA512 6ac89e26b5d0a7fe78ce73519200fc814bdd8bc3351dd8d16ae7315de89e7e7b08034cd0278a2982fcb78aa5b8c6965f5763d2f6e2991504a313bcbb4b345903
-EBUILD bash-3.2_p57.ebuild 4520 BLAKE2B b7e09a3b166f43e848790cc73b56b69ca958cdbcc47c53d74f7c768b4ed19bf752f2912e4fee72a135f734022ee16bd79ee0fb7572d1e9be56728a3cb5e0218a SHA512 5f1b6bc5ecd7693590ff60f261a080330339e1b9e61c69be7617929630ae873cfd1ad4e38d77cc4c549a877e2735cd2dd736c2e1f3fb825a54ece04d48dbffd0
-EBUILD bash-4.0_p44.ebuild 4394 BLAKE2B 9da1d4a842ff141205b266015a344e2b6a03475158d31c3e882f9c8378951a92606e736ffd0e746debb554c4a89801d36b451f197cd9a4f8bd0baed0feea64e9 SHA512 c5a9e77f8a340f075b527e2df6665a906b8c0350e20226db61bf4c8f54b58c7054b8e82cfb560b312cfe2be6dc3719c88e465328681092a2f1505bae4cd24ebe
-EBUILD bash-4.1_p17.ebuild 4128 BLAKE2B 0ac2800c57c962bf2fbe5fc4dfabb4c26138229651a68070c98f732e240f30aeb173cb2a424c3f99e92f36c6bfe0ac36ec608bc6ff45ec56f34eefcb068971fb SHA512 14616a3d1e26a448f4f89327998fda4ee488019faa704d35cb738732353b4358a8581ffd8aab9cd9288d112254889fe1a3f250cb911b47011cf3a210a3e1ccb1
-EBUILD bash-4.2_p53.ebuild 4318 BLAKE2B 979526637999c583b2dc40ae53bdbbc9cb0a19ac96eb33a840bf4afaa6736fffd547d940879fe57904173ce4bb0469a241461aa7d43e8dcf351c91797f2d2414 SHA512 a6f50056f8cb18657aca7691767e168159465c5a9e18aa8d5d91baf151b22d0463baf0d61b535f3a9db4772c22e3153360c5d27cade86be4333434184016768c
-EBUILD bash-4.3_p48-r2.ebuild 5616 BLAKE2B c2b1dd5158d9e1e54ce4a55480074b1fd567f56d83de99c290d5400255d6e3f4d93f9dc47a23411e51cd3a0128ca42f346ca6808a11803ea0fb1cc27574c3d32 SHA512 f8263bcfa00e313334d1a321515e5890c9023ef487ab104c862e3ff96e2036724c3f82d5c38a07ad760cfaac813cb4a0ea430d5187661c9ddb8af7da607b361b
-EBUILD bash-4.4_p23-r1.ebuild 7306 BLAKE2B b44ca28462fe2bf71be9489efcaf3753fe92d66168dec9516e5a9ce913ba89ef03ea8895282f93bdf7432c844d8a2b172627bec5cb241686d6e78558c3c90642 SHA512 5951cb0fe23ff113c9c6d2e02939d36490c03f978c35691d2420381f6cbd8de57ee91b1f0d94ce1ca68c14d98a4f45ef61eb3f848acb3185e88ba2a769f15c36
+EBUILD bash-2.05b_p13.ebuild 4600 BLAKE2B 6bf0599ce8ce0885c9e873a512fdd5f6d6afb94ab11098adc72df89946ddb7e291597923dc1dd82ac74d2967e41a05b58caeae34f2e93db1863da30c77954b5d SHA512 a20d87b518ec64acfcebd921a433214755f4a9b278d030deaf7b1c3038013a2daab47b475f560f18c1280a41857e4f84b6d4c813b6cd7f5ced072f3d62b54a69
+EBUILD bash-3.0_p22.ebuild 4733 BLAKE2B debacfdaee9f129e5135f994473e0e135d19360ee085ab15d09e48a560713fc00e7d607af0bdb577c6b870f9c9906bab41ce2361f5c0ab940ac35b7b35a31df7 SHA512 35ce9ba9085fa6eb72f7c9aba4caf32ea95a4d337b0949efb29be4d611d34e0703d33a8b3c1872882f12ca1971cdaef0e63b6d62da3f01cc7804edd1c5cc0c4b
+EBUILD bash-3.1_p23.ebuild 4414 BLAKE2B 54f79841105ae9f31025de47be4eed9a5c823f168a0cbda35a9984231664f9a44141240825b20cbf83b13f55e4ce08febd16a1c6ad4c07268ea7a8156d87169d SHA512 b91f3cb231850c331ba22e8d68df1a235b00799dda1c0579f1bf33192dc3387b3e96e1a0ebb3f73be606748022ee8c77342707184259d0642985d565d21918ba
+EBUILD bash-3.2_p57.ebuild 4521 BLAKE2B 2d33e812093e18fb63ada4a8fe5bc287ee6a99b54d71678e9d88b0b2e8549332c80361e1f5788e644e3aa4e7eb4da71f06453fa14241f86e3bb3d38533cf008e SHA512 5c5c91352b705b340e4e5eeb506f1cd331beb001786b6a4a49c802a30f513480e9b122dcd5842d3a4141e5ce5e75ff01c30bdcb6804ae4f2b13d00cc4ad52b77
+EBUILD bash-4.0_p44.ebuild 4395 BLAKE2B 0d9d0f3ec78ebcdb3de84b35821f32706b422665d18dabd60f56ec3a2f79305a29d83198a6988b2b8ff55d0aff8f4bf6d3a3cfdb2cf769b90d09a4dd83212865 SHA512 3a6b71a0b9994feea21e680b34f1e39332f19753d7e1f158844697f98ec12456adadb8e8646555c327690785e3c9f1333593e98b37b8b1a73155e3f8a95e500e
+EBUILD bash-4.1_p17.ebuild 4129 BLAKE2B 45cdcbdb040da11e2299730d3efbca1d6321f9059589e97131f9f192e6de40cdc4ee6a55857c0763732e25be60a2b1d8361d0e4da637440231180e8729b2d1d4 SHA512 2b2a7e816906f9f09d4b7bb94b215fb8dc7d0fb911a3136fad54c2ebf9a285a31101923721ac835d43a75458e08b2d479bd9cd82cf2e1106f2b6f662804186b0
+EBUILD bash-4.2_p53.ebuild 4319 BLAKE2B 38bbc2970101a2828ed508e7e0ad4574389eeac1867dc963b8a14ddfb74f6f7395ade37b2604391c7745416f99913dec6f663ba95adc623a85157163f265522e SHA512 d11094b1734e9fd63b1bbd174c771fe3a7a48bc1c550fb2283fe4d49d490d63db173216a275840feb4dff229a874d7a80939a8af22b4780feb9e1bc8aa244a31
+EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f478c0bbb8d9868db7bf8378fecca1216cb539f857400bcdabde08d34c159f2f32fdcb05e6c059574ca8a366ee3d SHA512 e4ade3179cbffd11e928be37b721d9d42aa29287035efbdae230ac5340173988712aeff3beca1c5a937270f9092b9ceb71589e5e41199b8608503e739c7111f9
+EBUILD bash-4.4_p23-r1.ebuild 7307 BLAKE2B 1e109131319e211688d2e2a5bed8344babcde7037262350fe8eca4c1d5301d14d6ce464da59709c38933b1c4d0a049cde37f7695df7c4c6986fcf13d6a41fa65 SHA512 ae5a118cce1b0422494fc596bcec7b305c1fa5a652e5f8d083003db338d4fcf5db9faae2aea4e6b6c461139f1c833ca12194a331bc257ce63f2179a3bc69f397
 EBUILD bash-5.0_p11.ebuild 7364 BLAKE2B b4e5d6d31823963a153e4550d84f7ccfdb6cb7d1ec03082bdf4b2ac64ff525c559d87ebfce56a7df630dd63389aa068735c05429b2f134a1eab2897e99f1cdac SHA512 34db5bd4b01c479149b825130fdc0a55c04fea401183084d9c1824a68ec7a7d07c51f691be2afd3742ff9511014ddab8539edc97adc7cbe42748cf8a1b96df19
 EBUILD bash-5.0_p16.ebuild 7364 BLAKE2B b4e5d6d31823963a153e4550d84f7ccfdb6cb7d1ec03082bdf4b2ac64ff525c559d87ebfce56a7df630dd63389aa068735c05429b2f134a1eab2897e99f1cdac SHA512 34db5bd4b01c479149b825130fdc0a55c04fea401183084d9c1824a68ec7a7d07c51f691be2afd3742ff9511014ddab8539edc97adc7cbe42748cf8a1b96df19
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index bf0a00d9d9d3..f5a44266db77 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index ef7c0490adfd..cfd3e4195cb0 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index dc0b295022ff..05a7f9dd6087 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index c8f0a3b2e70b..1c31b22879b6 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 149db9cf062f..a3dd97b7f88c 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index b8b60119ee98..bf95280c8391 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 90493fd20355..000f5397f9cd 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 1a621b57e37a..97bf26b8e8fc 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -37,7 +37,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0=
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index c37d924ea24c..dc2d39a7d27f 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index a1cf288ffe13..e2d1b3cc09ae 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -5,7 +5,7 @@ DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
-EBUILD fish-3.0.2.ebuild 1649 BLAKE2B 08f38170ceb58a9d88ba60a9cdc075f7ccc6bc69befd7236ec2651575c185f54cba34544e0f608997d5709cab1a2b199780e48b9e14ac372ac3c5c8e7615fe00 SHA512 1ae171d8908347ae0e9eac499423b95769d8bbcc116af39635622114bdbb142a2afb77b6e73f8bfe5df2e962c68ed7fd834f2bf925f4bdebb0d4ab84e8783573
-EBUILD fish-3.1.0.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
+EBUILD fish-3.0.2.ebuild 1655 BLAKE2B fe92bb0efdfff55487758ce2729199743cf3ef7a00509178098a785d8dec6368e02fc18fe978ea403f0987b3ab7cf5f6adb948bd24c668c095205477da2f1ae9 SHA512 9ea057a38f500a0645bbd819c102501b308e5634e05dada1c5a976465327e958546b2b6695c7b3c39716c513bdb507faf499f1a48917c713d8f062d81701fda2
+EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
 EBUILD fish-9999.ebuild 1571 BLAKE2B ac710d0493195aa67c3b75cc09e4082961c19e36eb654bd3e08cc23130b1b4337a62ff690eb1611431f17434578006d3810d29098b09e54ec5392754043481de SHA512 10db344a2da9151b78856dca5fd09028fed22af201afbf12a7c244de478c6052c97b791ba94f81a588ce2372d041872afc823a203146de223cde2a30fad31c17
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 214ff1c5b51e..74c634df070a 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fish/fish-3.1.0.ebuild b/app-shells/fish/fish-3.1.0.ebuild
index bba5b8321d52..77f6617e11c3 100644
--- a/app-shells/fish/fish-3.1.0.ebuild
+++ b/app-shells/fish/fish-3.1.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
new file mode 100644
index 000000000000..7002765f73b2
--- /dev/null
+++ b/app-shells/fzf/Manifest
@@ -0,0 +1,48 @@
+AUX fzf-0.21.0-makefile.patch 584 BLAKE2B 314673211be6170b0afc0d95ffa49f78afbc2bc2ca99295b109652b5d03f4664cbbef707dcd04ffbba4fd0e0ff21e54680fadc3f4b4ca34fdf950439e30974d4 SHA512 ca42041bf35405b07c9d9dda2b67590f22bfe4a12bba7116a7d138f730b288c916bd41df3302f9401cc46e03ddda5ec36a260b9a4b977f2eafd1d48ea3dc288f
+DIST fzf-0.21.0.tar.gz 161819 BLAKE2B 2da6b62425e88c10fa8d3ce3b7d2d25c67a9bd99bf3c402a8e0c84e567f931393fb914e365d0840d4a21409b06b6c76b7f622b68fe99fa5edd9fba8817eefea7 SHA512 8c3b7eb14ac98b386c26bd6621c54a27e904985f2e87c37ae8f31c3596196f32a817be17aa5e7dd399757cb90b5f25c35ce4a240453eb28f7d1d2fd837d8900d
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.zip 19769 BLAKE2B 0e0f4d4ad5d19d5a0c7ffec0007cb04d9703c8d27f90db5f5c5a367477bdff68feb50278ce3d9f01be1b6e44f579c15e9f65a88b0e9bfb83b4ad4beac6a62ca3 SHA512 e34dcc87f0141e505d455ef9ccb83c11fb0d4625bdef6f30ed3ed21957dc4356cbcd370b005c2c9aac25763e36b367866690682c0bb4ae4cab24b799e70f2b99
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.zip 8150 BLAKE2B 50fbd50001b69238741ba79fc1021387ebdfcfe54fb4853c0e3c2c551d5e427b4311d9fa2062860fb26e42573367442ae58446cb8823f3fabca8228d9df47288 SHA512 896aed87f7b0c4c30c2e8e37e3cd290cd6bc1a427a4ea03c7189bb59cae8a4447754b20e51e6bb9002245365cc5c03ae019e7090d8e08a028c40ee080e997c6d
+DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.0.0-20191201085201-324a081bae7e.mod 164 BLAKE2B c6b2db494ca0da1bb96078d7fd39d30237562fe19609be4436df562afed900c63fc3cee28198a27327fd0f64f1e2bab529ac38ca57d51df48ba1ed6e5d0369a1 SHA512 22f6ea96071109063fd7bceb7295a56bc4da40d603cee238bd969b95dc74b4c6a93a3a88b8474a83dc9082ddc4fb0607e987e79ab7c1f3839578bc6c998936d6
+DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.0.0-20191201085201-324a081bae7e.zip 18356 BLAKE2B 9bb0230c260701c5294153c7a0b98e1886e12110289395e6e7a9bb613682e0036bc5e2156372b9b1e5cdc34b8e5cb50e1526e7e6350e5b7d3bdc17428bd70d46 SHA512 17969e66c37a990b2c761dfd8b93a3fa51d12be201e4576e35d805e5aa7c0d75a9f8bfb826f55d6ce5fae18c7d2bf11a7952f6d9940326003db5fde4954a905a
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 1859245 BLAKE2B e33051036e462284bf672b92f35863014e4740917c856eaf5aeaea6530dc5ff77fcbac4d797aeb8131cd013bac525e502e582f7139ccea4d3c226fdcff83ba0b SHA512 7c0734618d52ac2f0e2fe9245fc15208d13f05e6ab3e89b4a76bbb94e2895376f3d5a7d71d36a020c8861a0ed94a344a534f4d3b6bd9003d153e4e4b80abaf05
+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-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+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-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 1916427 BLAKE2B e6030582f47eb0fc2049d9fbf73b03afae4d95a506988d9538d1f094a27ae63c20d5a5ce79d63f09cdd8c0bdf80e80c6de498960c0173e170dd31c8060f89f30 SHA512 62ce13928c6379717545387d68beba5106ef3b745ae7b458ea457889e5c6d186bf96dbbcf8cf4e81f9e6180260b8c60ca34a4bc58c434d7e9150d51fc72540b5
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 2877934 BLAKE2B 193ec7c3e8b82001b06f630dbda8afb9383ac66d7a23fdfe27414f91a2f2e17490b98605023a8a990f5f9fc5f10144fd01b1854fdb1a39d608cd305b0243dceb SHA512 553de87d4a0fdf45e1ce5128ee704ef92c23d0dce1182671c80e324c0f0ef680732bd82b02d8d202d2c1ae7d4d1bb61a944b60d92d0f99f716a5dcc09ea4701d
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+EBUILD fzf-0.21.0.ebuild 6476 BLAKE2B 963c8c04123e93eb681e3f9bfc1e50f2636f1b89710623c2c6d52d21107369050455b356c53ab7d74c9ba6fe760f0665da7b4d1d774c842957047d701269c5e8 SHA512 3112aea2d3289b0450d11d6a3f40d29fbcce9d6ff1d9dc14cb6a48d43990c98572bf33d7d675f3e3ca31770938cde0758b73f7bcfe4fb3d476d9ea2c4da3b490
+MISC metadata.xml 1466 BLAKE2B 7157dc754dbbd229dcc15e449274bafd3a87f73285ef609d09f6585a326cd43d13cf103928a0ec9cd10fe9fdb5803c1b0fe227e9111b67d0e773afc308a56d87 SHA512 d191d571b3626cdadfbd81728dce0180807c8b091bd7b3e73b8489b2b000414d02ec8b41e975312045bbf84fabb8fe1bd11ba46f19be0363126ad05ff30c04f7
diff --git a/app-shells/fzf/files/fzf-0.21.0-makefile.patch b/app-shells/fzf/files/fzf-0.21.0-makefile.patch
new file mode 100644
index 000000000000..24653a7b8219
--- /dev/null
+++ b/app-shells/fzf/files/fzf-0.21.0-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 037b19b..60283d0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ ROOT_DIR       := $(shell dirname $(MAKEFILE))
+ SOURCES        := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE)
+ 
+ REVISION       := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES))
+-BUILD_FLAGS    := -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)"
++BUILD_FLAGS    := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)"
+ 
+ BINARY32       := fzf-$(GOOS)_386
+ BINARY64       := fzf-$(GOOS)_amd64
diff --git a/app-shells/fzf/fzf-0.21.0.ebuild b/app-shells/fzf/fzf-0.21.0.ebuild
new file mode 100644
index 000000000000..854e90d08e55
--- /dev/null
+++ b/app-shells/fzf/fzf-0.21.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils go-module
+
+DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+EGO_SUM=(
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM="
+	"github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko="
+	"github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg="
+	"github.com/gdamore/tcell v1.3.0 h1:r35w0JBADPZCVQijYebl6YMWWtHRqVEGt7kL2eBADRM="
+	"github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM="
+	"github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4="
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s="
+	"github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac="
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0="
+	"github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y="
+	"github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU="
+	"github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0="
+	"github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI="
+	"github.com/mattn/go-shellwords v1.0.9 h1:eaB5JspOwiKKcHdqcjbfe5lA9cNn/4NRRtddXJCimqk="
+	"github.com/mattn/go-shellwords v1.0.9/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y="
+	"github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e h1:NO86zOn5ScSKW8wRbMaSIcjDZUFpWdCQQnexRqZ9h9A="
+	"github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod h1:G0Z6yVPru183i2MuRJx1DcR4dgIZtLcTdaaE/pC1BJU="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U="
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10="
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0="
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e h1:1o2bDs9pCd2xFhdwqJTrCIswAeEsn4h/PCNelWpfcsI="
+	"golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+)
+go-module_set_globals
+
+EGO_PN="github.com/junegunn/${PN}"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	# Temporary fix for upstream building issue: https://github.com/junegunn/fzf/issues/1994
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply_user
+}
+
+src_install() {
+	default
+	# Install fzf binary
+	dobin bin/*
+
+	# Install TMUX utils
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	# Install Neovim plugin
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	# Install VIM plugin
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	# Install zsh completion file and key-bindings
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	# Install bash completion file
+	newbashcomp shell/completion.bash ${PN}
+
+	# Install key-bindings for Fish, Zsh and Bash
+	insinto /usr/share/fzf/
+	newins shell/key-bindings.fish ${PN}.fish
+	newins shell/key-bindings.zsh ${PN}.zsh
+	newins shell/key-bindings.bash ${PN}.sh
+}
+
+pkg_postinst() {
+	optfeature "bash-completion support" app-shells/bash-completion
+	optfeature "fish-completion support" app-shells/fish
+	optfeature "fzf plugin for vim" app-editors/vim
+	optfeature "neovim support" app-editors/neovim
+	optfeature "tmux support" app-misc/tmux
+	optfeature "zsh-completion support" app-shells/zsh
+	einfo ""
+	einfo "To use the fzf key-binding for your shell, make sure to use"
+	einfo "the right file for your shell from /usr/share/fzf/"
+	einfo "For bash, add the following line to ~/.bashrc"
+	einfo "# source /usr/share/fzf/fzf.sh"
+	einfo ""
+	einfo "Or symlink the fzf bash script"
+	einfo "# ln -s /usr/share/fzf/fzf.sh /etc/bash/bashrc.d/fzf.sh"
+}
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
new file mode 100644
index 000000000000..aedb67ebbf2d
--- /dev/null
+++ b/app-shells/fzf/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafspiny@gmail.com</email>
+		<name>Raffaele Spinelli</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		fzf is a general-purpose command-line fuzzy finder. It's an interactive Unix filter for command-line
+		that can be used with any list; files, command history, processes, hostnames, bookmarks, git commits, etc.
+		Fuzzy completion for files and directories can be triggered if the word before the cursor ends with the
+		trigger sequence which is by default **.
+		To use the fzf key-binding for your shell, make sure to source the right file for your shell
+		from /usr/share/fzf/
+
+		For bash, add the following line to ~/.bashrc
+		# source /usr/share/fzf/fzf.sh
+
+		Or symlink the fzf bash script
+		# ln -s /usr/share/fzf/fzf.sh /etc/bash/bashrc.d/fzf.sh
+
+		For fish, make sure to symlink the file
+		# ln -s /usr/share/fzf/fzf.fish /usr/share/fish/functions/fzf.fish
+
+		For zsh, make sure to symlink the file
+		# ln -s /usr/share/fzf/fzf.fish /usr/share/zsh/site-contrib/fzf.fish
+
+		Or add the following line to your ~/.zshrc
+		# source /usr/share/fzf/fzf.zsh
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">junegunn/fzf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index 31725a1bf31c..a5422642ea0a 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,5 +1,5 @@
-AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
+AUX 1.0-cflags.patch 882 BLAKE2B 451086d7f84b97fd78518838ac34541b961cdcc76e929153f1bdfbf0bf95e6ee50d923a33b70514314cb70b35dd48d3930a5f5281eb1d80588f3263cc5e6e972 SHA512 173dda551294d4ac83e286844e63af46e988d5ceaf812537e7300ade56a8d1ba5da4db2db9da49dce7ab491324888860692746e2ec47e8cf44dce16300b54dfe
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1140 BLAKE2B dd43a6af686eb670901b916b5f892ef81a770636f99f97c1b3828e34d0b25714eda200a0df6afd996011cd6cd8186eb00163ca2d1c7ca885777e132781422670 SHA512 23d2a7bfc89d4faed9217a15e71182c958f8c072c6d177744db60a2a2e5611cfa34c0c56a825773989240ce58d08318e4d70553ed39bd3d39b24aae8bb6f175c
-EBUILD fzy-9999.ebuild 1135 BLAKE2B 8dc3d18ffe57ebaff3e829499d2370d5a4a2f9098986178063846b5b1b81564c1e01d2e5ded7b1ec5485c40053b05c5aaa42c86e98730e26b38fba46fdc46ef0 SHA512 9b640390022027a82b034a61fa79993e10c02f41272c7a84d4a4094dca32183dab30820e93ede60a5dff47ff1944ebfb75abfc21fc39b32f8f35c11a24cb8d06
+EBUILD fzy-1.0-r1.ebuild 1136 BLAKE2B 7cb7b5534ad6ad7d612f084d5ca99ad823dd0907e870f5b887de7e797eb7cf4f91f0bf9830046f6ca44c83023eaeb06108b9d76eba1c56ce2def103a23364327 SHA512 f34088afe6520391e35addbd2d4b1d8a46989a852ab1adaf1262235c9b38a5335cb44fb0d860271bc421f75e5c8cbe2d724114a210c6872e1c8c809de0e2af91
+EBUILD fzy-9999.ebuild 1144 BLAKE2B b921ad2772abc770e3f263555ecbbb8403c37bb4678ebe57cd5f6bcbca1f7286bab86509fc44175d9cd3a177730d5df13b6285a5e0bea1f3d1038ffbaab7cb68 SHA512 8817316a9f1c35d39fbedaef6abfbcdb382779156b8f379e2de04c3748f15a0f5ab23cbb03f7553032393919337d29aa00c73699049e090f12bd1b0b1e23de22
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/files/1.0-cflags.patch b/app-shells/fzy/files/1.0-cflags.patch
new file mode 100644
index 000000000000..4805b4814a45
--- /dev/null
+++ b/app-shells/fzy/files/1.0-cflags.patch
@@ -0,0 +1,34 @@
+From 89b4a0437dce6f99de80482d484b3e0346067889 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 24 Apr 2020 19:12:16 -0700
+Subject: [PATCH] cflags
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2d23118..713daad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION=1.0
+ 
+ CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps
++CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps
+ PREFIX?=/usr/local
+ MANDIR?=$(PREFIX)/share/man
+ BINDIR?=$(PREFIX)/bin
+@@ -29,7 +29,7 @@ check: test/fzytest
+ 	$(DEBUGGER) ./test/fzytest
+ 
+ fzy: $(OBJECTS)
+-	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS)
++	$(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
+ 
+ %.o: %.c config.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+-- 
+2.26.2
+
diff --git a/app-shells/fzy/files/fzy-0.9-cflags.patch b/app-shells/fzy/files/fzy-0.9-cflags.patch
deleted file mode 100644
index 328abc9c6fe7..000000000000
--- a/app-shells/fzy/files/fzy-0.9-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fzy-0.9/Makefile
-+++ fzy-0.9/Makefile
-@@ -1,7 +1,7 @@
- VERSION=0.9
- 
- CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
--CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps
-+CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps
- PREFIX?=/usr/local
- MANDIR?=$(PREFIX)/share/man
- BINDIR?=$(PREFIX)/bin
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0-r1.ebuild
index 38f54c0bf9d7..660ca21138e7 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0-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=6
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch )
+PATCHES=( "${FILESDIR}"/1.0-cflags.patch )
 
 src_prepare() {
 	default
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index 8fb7bb35ba12..98dfd31e607d 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils savedconfig toolchain-funcs
 
@@ -21,12 +21,11 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch )
-
 src_prepare() {
 	default
 	restore_config config.h
 	tc-export CC
+	sed -i 's/$(LIBS)/$(LIBS) $(LDFLAGS)/g' Makefile || die
 }
 
 src_install() {
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index e34673717d22..1ee0e8e96ce3 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -7,6 +7,6 @@ AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.20.00.ebuild 2642 BLAKE2B 601b77ce442c4c81ba5b268ea6ca467ce3fc06624add8c2f191a9fa5da89fd6f54dbb6a05e2e137d3c966423bc27f98058ff9bdb88c6698701e222a80eccf759 SHA512 93ab1acefb0f0efa5c83ac0f1a22107b5e90b5caa17b32d1961554dcb115466f8482a4007d939dac2b2da6816d1aade02313057097f053d766404812e5605842
+EBUILD tcsh-6.20.00.ebuild 2643 BLAKE2B 18f5f6f6c4434ecc331d54a92cf3bfbf28dbbd3c8119c383118d75e94d4f3258a300fca173dd8ec2cd685a17842bcb9bb73b2fe1d4e8da3829e24712fc6657d9 SHA512 a316b4487f36f2cacb8c0ab72fde78cda4a26a5c502098fd4212dcd448204b288bc00abead1c63a5677f9c275a98aa1372c45c00431596f301a8121ab5b1d3f8
 EBUILD tcsh-6.21.00-r1.ebuild 2748 BLAKE2B bef89c082fee0b060df3bed0485feec42eeaecd69ac05a6e2dde14fbf01f7b5c47c1ea5804d5da1dc4d10e938858faf0f3dec78e4d0f335eb359029fcbd16dbf SHA512 e77a37522359267d6999e6abb3b54b0fe34e012e6707e4ccbf198ef5ae2ca3b8183fdb4d1606707815cc6becf7783171a58ff10eac0a9a7811ad06f6f2d5b260
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index 783c52ebb84b..94a3fd70dd76 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"