gentoo resync : 30.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-30 19:43:03 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-30 19:43:03 +0100
commit: 162945d2a91899b637bbb9e163b406350de12906 (patch)
tree: 49cc2cc66f724a7c6f033f93aaba4ae3be1f2259 /app-editors
parent: f660c6de84558324d784218831d8f0782ee41e2e (diff)
95 files changed, 1222 insertions, 232 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6990d589cd9b..c65a0016d48e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
index 58b0e89078a0..9dc3eca6ffda 100644
--- a/app-editors/aee/Manifest
+++ b/app-editors/aee/Manifest
@@ -2,5 +2,5 @@ AUX aee-Wformat-security.patch 225 BLAKE2B 0e3846a9e616ed9cef7a9f2b01bf6f71f080d
 AUX aee-ae-location.patch 2755 BLAKE2B 8b75ee712b5f717c82a073c0e35ceccdc0ed27d6b9c8f64841d6c246cd6761b5d42d121e78374029b0c0252c479ca56ab072c7612d0ef758641cefb1d32459f9 SHA512 48ded083b407d1fb94764967358dc6c858421a3586e56fca1803980912b90404dcbfcadfc5a041b0959e2e10b3a5224751671ec067687b2e361eb2e27eb86cfa
 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.21.ebuild 1343 BLAKE2B 61dffbd3a62709911f4d40c9a5f75e6f6f15a9a8e31effc4744c63cc52dd76b41709c8f1ee69e64c838fd51c799b62ce86e52212798c80eefd76a855fd65f4cc SHA512 1c580bc3252192e07a00a385c938b47283354609011e4ac5844779437a45d7c4b0fd8f2eae94275dd92958837f251c0f7aa31f4b579fba49c5cf7a6880fc5846
+EBUILD aee-2.2.21.ebuild 1350 BLAKE2B 7ee8f9d723256ce7c4b02ea3829ad23b28dcfaf1458bb7b686579c129c2c40ee1d0e038d8f61de2dbee26946e9c041fdbac9f878ee5ea2eb4b507dbf81f28766 SHA512 82f92ee029450a74685e79f1fff73cb070a18e9914da7442db5c786db59f8c49dcfe355f8abb5f79e0dcfda32f210437c81e807190eb48255b6cfda84a1be739
 MISC metadata.xml 222 BLAKE2B 425bba0db7c4bc483eddcb51bb4151324b62afc42496047413bf9d0480fd731ea78201a8b99c42d9adfa9b20614f9507e8e89a87e9afce32aa9db82f42f827ed SHA512 7ae4d3d64e85fb01194d31b41843c10e3bf6a782e9f308cbe3f0a75c0a07d6af2a88013549b5840b3cd5e766d5044f0da290c31a4800d1823f6eca4028b082da
diff --git a/app-editors/aee/aee-2.2.21.ebuild b/app-editors/aee/aee-2.2.21.ebuild
index b4b1aa5d647e..9c616e016bc5 100644
--- a/app-editors/aee/aee-2.2.21.ebuild
+++ b/app-editors/aee/aee-2.2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux"
 IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-editors/ee/Manifest b/app-editors/ee/Manifest
index 2bf36581efef..a311d438e0ab 100644
--- a/app-editors/ee/Manifest
+++ b/app-editors/ee/Manifest
@@ -3,5 +3,5 @@ AUX ee-gcc-10.patch 352 BLAKE2B 7e1d9bbb12d21445117d108f666884959fa239f2c7a48e23
 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-r1.ebuild 1289 BLAKE2B 3075c5dbcbb77fbddb5b5b8d6b6c0e4854f4086e326ab5d4759f484b44e5a3a6d39cdeec8c61e7880e9e6cb82a24b3ffc292cd209145edafe45604282b17fb75 SHA512 0749fa43ce92a3984903a47e801936bb1a987f524441a2d925e0a0e5bbff5e86438d7615925a852c73e8ba383bbe13e517e66707848d2324f88479ecffade0f3
+EBUILD ee-1.5.2-r1.ebuild 1296 BLAKE2B fc292400d0919e9d343da0ecedf52562c6e98d9687309f1144460cfe5edb5bb37e6ea4f47182b18895ab5b87ebb6d7b85a3c0377358ee8c863d8f6a0a9fe78fa SHA512 305a15f5cd6c0a6c25c12d8bb6eefd3cf7ab8ff671d3f8044d3df2ce24dc30e850363342a67bed07742d9930876cf5a3daae10b1eb9e6a40bb0af2f56f9b9a17
 MISC metadata.xml 222 BLAKE2B 425bba0db7c4bc483eddcb51bb4151324b62afc42496047413bf9d0480fd731ea78201a8b99c42d9adfa9b20614f9507e8e89a87e9afce32aa9db82f42f827ed SHA512 7ae4d3d64e85fb01194d31b41843c10e3bf6a782e9f308cbe3f0a75c0a07d6af2a88013549b5840b3cd5e766d5044f0da290c31a4800d1823f6eca4028b082da
diff --git a/app-editors/ee/ee-1.5.2-r1.ebuild b/app-editors/ee/ee-1.5.2-r1.ebuild
index 3abbc7fc930c..5d83f47692db 100644
--- a/app-editors/ee/ee-1.5.2-r1.ebuild
+++ b/app-editors/ee/ee-1.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.src.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/ersatz-emacs/Manifest b/app-editors/ersatz-emacs/Manifest
index 355515c06312..23d4395a11f9 100644
--- a/app-editors/ersatz-emacs/Manifest
+++ b/app-editors/ersatz-emacs/Manifest
@@ -1,4 +1,4 @@
 AUX ersatz-emacs-20060515-gentoo.patch 987 BLAKE2B d179aefe21c91d8d207ac6278334a2b2c7de91a46443981099be9926e75f047a688bf18cf290236b00b4a1be8581abb6142e56d53d5f252f5425789b9debbfe7 SHA512 3d411fcd237e320a32663abeeb5030748e9fc678aaecc51d004a538ae0163b447107b8068fe2f17ce4220f78865aee59251810b9ec7044a829bb415cd78f7b2d
 DIST ersatz-emacs-20060515.tar.gz 45581 BLAKE2B 641cad2f5a873b0c70743a6f60ffc31615bb8789d5c6a100a67aaa82c59e7a83d35023eb596303ef0160e3ff561c89e5814b685a7a650aa4625326e86ec4fdf3 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d
-EBUILD ersatz-emacs-20060515-r1.ebuild 1055 BLAKE2B edcfca6d372481cfaee31b1345f214df9a40f62af1670ff32110637872e7bb3b88c1320ee8a2a27e54d32d70b1a0b4e833220930d4dd1117bf5d7f4c601ea03d SHA512 dc2b9159f80ae00dd21b1890f760860e800b80657fb63e4ba44ffffdf5318a5ab3ae346dcb7c7194022f98ab7362c85b99ae4aa7036fbc09fb1103b634fab0c9
+EBUILD ersatz-emacs-20060515-r1.ebuild 1062 BLAKE2B 67f40a387d02e897d9de0082ae38aaa50df2725b75311d16eff40dfd59b19602da9059647198b6b54800c0aaf1b6abd4607cf50bdbbda15157b5f217a4bcb9de SHA512 aa9ec164b2d3db69c9f8131550232a807ddd8e62d9d89a3c3ac09122461de88a743d3e5b9ce5f40c11da928aaf6cb2ea1855a5f8d5c37e94241516baf689ebda
 MISC metadata.xml 611 BLAKE2B fa7ab3d538319a9ca4b8f355ff202472adbe8668bd618a93032381ddbd8ee1513fd9c50231fe2b55128b2f995f537873a5fdfe509bb7422e04fa6d67be2f2157 SHA512 caac3475d53909181223de001b6498fe6a88e93d65f31f186f5e9278fbabf0b87b493607896d11507e5bc0f90bf8a87f45a875611ddcf3735b48ab6410447e1d
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
index bd82fcd95ff9..2ba8eaef0285 100644
--- a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
+++ b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 0f89cf3601cc..a5939f8ede26 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,5 +1,5 @@
 DIST featherpad-0.18.0.tar.gz 967643 BLAKE2B a8a84fa71232bdd9448ec4a9c921f8f452212dfb52ec518c3f340e9b600858a9cfca2d7729a0f58c9d1465b77bd28c836de78026c58ff94297de704e7bf670d8 SHA512 3e0d008792dd55bc5e57654f9b032f0a66a60c682499c684cfc3b182fdc57a654bb5fb195b458af66ddd8db929b31e7bfa789bd9bdf33d32454fbbcb090bcd91
 DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3
 EBUILD featherpad-0.18.0.ebuild 636 BLAKE2B e5b1a37e4cc813f7f502f39468a97046f143c753a8b285c32b6ac9ea820fdd6dd36c3e731d09658a94a88c1ea3f7b103258a1d6423d31cf9b56543d9c028c549 SHA512 07330a8f3d99a19145711256bc3372af4fe52ef5ce42f379d0c1d2a52a09886c2c12d022faf9656da82afff682c5e3ba8934219d3bcd18c6797e34e2a1a4f5da
-EBUILD featherpad-1.0.0.ebuild 751 BLAKE2B 1a9809f2b2fbfa5e5109b57456d2adfd39725ba614287613e5c9839d7306f3be721084c7dc098884efe58c389902c1fee48a629cc3f88fa06317510db66cbd05 SHA512 4f584e94a6aa7e23d1a5f19c951d2bb884ce426476a106eca8e14843f02064b16b958355f777344d5d5388893f16f8d40d17976716e93fc3e6be76db0087ec4b
+EBUILD featherpad-1.0.0.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.0.0.ebuild b/app-editors/featherpad/featherpad-1.0.0.ebuild
index dc209562867b..ce5b1b855fdc 100644
--- a/app-editors/featherpad/featherpad-1.0.0.ebuild
+++ b/app-editors/featherpad/featherpad-1.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/FeatherPad-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+X"
 
 RDEPEND="app-text/hunspell:=
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index ff4ffada265e..9fffaf910868 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -2,5 +2,5 @@ AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5
 DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf
 DIST focuswriter-1.7.6-src.tar.bz2 10311965 BLAKE2B a1f1627df988d7660f6b90cf984d725ff2366754f01b0ce78e23756a98c716acafa8b4076f4749f117cba6eaabcb6ec61516c032a7ae770eb1b06466a358595e SHA512 45e0bc9b20c73b260aa42dcc9ee79515d3ad95d4c9586f60ab75fb404f73c7443484f238b3705ba3224b852a0d9b8b8db17d9145aebb77513f8597a01ab01d3b
 EBUILD focuswriter-1.7.2.ebuild 914 BLAKE2B cefbcd3addb8d18a80e419984d003275b16c3c6d5ba6bfd552687e540d846e7a075f7bb0f3d6fa6ff91bed484676c2370ce5275cde33fc0b6cc0030b477fdead SHA512 e835fa1bb106885f9abcf733363e4b463f60bd8d315b00b7f46b4c71bc6d2892e4630812209d471f8360e328f3a806b1b2c942bae49b1c511a9ec57138f6b5ea
-EBUILD focuswriter-1.7.6.ebuild 914 BLAKE2B a93103118e1c69bfc8ef7d58a5974afdc5b460187716898141de1757685253de9ae3512eeb5b7c2f1e058b23ac49c1c9c78491abfd575e785f04b563a64c9566 SHA512 4400872454853c3714f99ee387eea57d593609c0f3f42978d682918f8214ac37f46dd71d8fbf2f4a57af712095c7630b028e501a71b73de22635ae9aead14a3e
+EBUILD focuswriter-1.7.6.ebuild 921 BLAKE2B 58280ead08cd671423371125732e36453a2b10bb474d1c9aa4c6fa90090171fc732744e47fd58d1cac2ecbb73222fd3c8b318ce8517a8ccb148db2a57c22a268 SHA512 7db62b7dc05997233673bf5fdee26d6a147722aced275ed8dd5041fc19bda80c394d6ebcd41255ab2ce7e7f1a98daacbc0a66d54d40f8eb9c3511a64039fbb1b
 MISC metadata.xml 393 BLAKE2B c479d3b5787d156fd03b2db6eb73ad9d151ca64ee6e018afec12dd0ac5d4269c9d38570b98813fc601f5ac9d4615e844b257c07089bf8d8ed59d690c1961c36b SHA512 a166c49cb67ed6968930db5af5151540ba78c7412ce96738d510a10074bfddd7b906a745ea6c9abe3a49822d6fe8a259042b56a819ff4dee12dd52d7171cc326
diff --git a/app-editors/focuswriter/focuswriter-1.7.6.ebuild b/app-editors/focuswriter/focuswriter-1.7.6.ebuild
index 1809229cfbcc..e509c5be66d9 100644
--- a/app-editors/focuswriter/focuswriter-1.7.6.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index a29cf8aabd58..9971e6c8c449 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,5 +1,5 @@
 AUX fte 604 BLAKE2B ccb21ce020421a68d33fb94185d3acc6ad26f6f8cd0c574c9ca611aa923180e5192b6271312575f7a64f329d3e25d2722b07425553cfa57e54ed55ec3668f0f1 SHA512 5f93df643282016c352db88cddd37c1b9f86d94654a7eff0089b9d349ad3f56ba4266cb2431ac3a418bd4b5aebf6d7ad04c26099061942fd3e90fc9fb938322b
 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089
-EBUILD fte-20110708-r1.ebuild 2653 BLAKE2B 7b2172266ee2da81096a32b0a62556f96cd56837f126fb40d1d09a1387040e217918df0e1a8cd3714fb92720ad90678ef6dd48ddad4e36ad028f340329299724 SHA512 10a904498159c9ec3508543deb651f0a406214d94a14c13b4b122337d73e034f0383720baa950acc06150d66aa31dc09651add49c719bb0fdf693fb526443a7e
+EBUILD fte-20110708-r1.ebuild 2660 BLAKE2B 5165a43247aa56c8a2d010966aa8340445c1aca2a00408299b41f8e25538294629abab07930cb19cda4a115c769fc6615c9b55553b994245294b14185ba25626 SHA512 61e7ce7f02cc8d6d97b13dfd602dd7891bc44d9cff7c6f05c164331de244394c1b918b8d6f8b46ae8a5a27990d2711f57b731eb87f41427f247e93d8ad3bc63a
 MISC metadata.xml 246 BLAKE2B c22ca7b794ba8207cab2c40ce029b8a2b243cbdad6c81b55647793afb87946a9abc60b471241040921785b94271b0db77d54cbc431e4d838d7af4d8927f16463 SHA512 dba2d9c540058e01a45e75cbd551b3be73bae391dddae18eaa95dcaad29d26620ee8d12c755b11fdd9fd759458803385fb74c3c0eada2892dd9af3311a771cd1
diff --git a/app-editors/fte/files/fte b/app-editors/fte/files/fte
index 2e4621b92a62..2e4621b92a62 100755..100644
--- a/app-editors/fte/files/fte
+++ b/app-editors/fte/files/fte
diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index 96de0620957a..5234cee9c559 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 2ff4ae4ba518..384f6b0b2b05 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,3 @@
 DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42
-EBUILD gummi-0.8.2.ebuild 933 BLAKE2B cc47d40263a8735d2587da09aaf011da249aef3cac9dc37b3144359ba82ec5b24814b1643c94cb0dfa4204ad7479287fe4219ea75c260fa8254d80ceaf260be9 SHA512 4a9becb0cff5ffaac6b76a8f92a244f07d374cb077c124ff595e9c0f0ce770db1d1a8d55817605b048538abaad16284ba9f142c58d88d2eeeb176f80e6fd82ed
+EBUILD gummi-0.8.2.ebuild 940 BLAKE2B 10274733b4460d5c800aa046b08d64a598c6522c66d4be667daec174415ca6e3fee75d27ee42a8b09111f0bca312cc5a5224f0a48f35851ccb0a3823bd04cf8e SHA512 be92f379568a87311fb467d73dd0b7974dbb4fa9c346245f9d2472f5551988f75c2269f7972b7cdd78812faef4e285b9dbe644e6cf6930adde390f0d77a6a54c
 MISC metadata.xml 616 BLAKE2B 6a28c7bb204b0545080adaadc1eeff936a25e4ea0c66b6b869a8ee5b3aa21fd212fe22addfeb6e7c6ec22afece7e831cda4afa1ac0369cbb392738d471050398 SHA512 d2233d0cd21cdcfe87c20db06fe5e9c2a430c57d4fe644ab80f3eb3f434e614d2a7aa006db80d7c3d7c84b93ce8abf7a1b7124c23feee056aa52e42205c86485
diff --git a/app-editors/gummi/gummi-0.8.2.ebuild b/app-editors/gummi/gummi-0.8.2.ebuild
index 1fa127ba4ab1..f9323abad36c 100644
--- a/app-editors/gummi/gummi-0.8.2.ebuild
+++ b/app-editors/gummi/gummi-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	app-text/gtkspell:3
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 2916f3895199..9c89d8ca78f8 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -3,7 +3,9 @@ AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
+DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
 EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6
-EBUILD gvim-8.2.3428-r1.ebuild 10633 BLAKE2B 0e7f3b2a425215ec097edc7288223dbf622d4d78412122f565370c3aab63b32506231e733a0061b6a996612aa474c08ab6b389b9699eee6a98fbfea444941f4b SHA512 d69b986e5004f2f3bc76a56a93660edde6f7502ff2bf6c5695f93901753965f5c9a8fef9282083eaf1f9d06b2d3b1373bb1aab3f647cb7f1f7544f9ccb8c76ac
-EBUILD gvim-9999.ebuild 10626 BLAKE2B c947c1839816c57c403bec4585aef0e32d301ad7f20ffd18e0cd4c65f9ad389ddb5d98ea99f386ff7399deb0b0d9abdc64d55271b4d11c76680fdbf9b439b583 SHA512 3060d3c97496a975f2ee26223b448e33c7eb10e59923884866f0ee920a29cbbfcdc6f1f21700eed870a425be84662dcfcc4382705d5966eb2dbfae7b02515480
+EBUILD gvim-8.2.3428-r1.ebuild 10631 BLAKE2B de9a5047c96ff952ed2004965c5b1adcd209ba44332670ea93401330a4f43b5a20f1594866056e58848ae3b29c95676f9152b02869d7b349f8322943dff4fb7d SHA512 e7f96895faaef356c64d80156cbd90992d9d15f4e1edb785993d2f739b899243278e15b4e804bb705cb32d1af18324c257c655a6433352f0d621869918d00186
+EBUILD gvim-8.2.3567.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
+EBUILD gvim-9999.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-8.2.3428-r1.ebuild b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
index e095a619da4a..4fa786479d89 100644
--- a/app-editors/gvim/gvim-8.2.3428-r1.ebuild
+++ b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.3567.ebuild b/app-editors/gvim/gvim-8.2.3567.ebuild
new file mode 100644
index 000000000000..a68b9011e15f
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.3567.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable crypt libsodium)
+		$(use_enable cscope)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command "${PYTHON}")
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	if use lua; then
+		myconf+=(
+			--enable-luainterp
+			$(use_with lua_single_target_luajit luajit)
+			--with-lua-prefix="${EPREFIX}/usr"
+		)
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                         CARBON (not tested)
+	# -aqua gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 0a202597784e..a68b9011e15f 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
 VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{7..10} )
@@ -17,14 +20,15 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
+S="${WORKDIR}"/vim-${PV}
 
 DESCRIPTION="GUI version of the Vim text editor"
 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
-SLOT="0"
 LICENSE="vim"
+SLOT="0"
 IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -75,19 +79,18 @@ RDEPEND="
 	sound? ( media-libs/libcanberra )
 	tcl? ( dev-lang/tcl:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
 	sys-devel/autoconf
 	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
 
 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
 
-S=${WORKDIR}/vim-${PV}
-
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug 82186.
 	unset LANG LC_ALL
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index 80fde9a06800..846953df38f0 100644
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@@ -1,4 +1,4 @@
 AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a
 DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb
-EBUILD hexedit-1.2.13.ebuild 695 BLAKE2B 660887f7e70f77d396d3d9e6eee029e323b65c654d05a2cfbd1ecd30e9baee24362379c4fd91fd833b83d50d8f72820c0e375fe7a3f31cdbb9ad3324f4e88a69 SHA512 0ee3bc0505067752f2d0c8b83cb476bd81b9c441f42ce298fb96c7183ad19810b93ce3eb886fc6a23ece7842f79bcc9acbe8483ebaa61f0d32c6cae76bfa4363
+EBUILD hexedit-1.2.13.ebuild 702 BLAKE2B b2baa82ded8ca1e5d01f83aa763a4df04f527b653ac3bc8d7063974f684082dfc0a2276a505d28dbeb5a5085ab8feb1281c4dab40aa9e39290600ab47146e1a7 SHA512 1e8acb13a25382648b5593e75a347f954e3f229f3cd44d85d9b877a2bc140df3aae80defa708778db9e2d32879859efb41a33f1f2bbaff5abf71a5562c5f9834
 MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index d0b42fcc75f5..1acb531a9217 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rigaux.org/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 8895af48ca85..a3e57b3f02e9 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1,5 +1,5 @@
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621
-EBUILD hteditor-2.1.1_pre20161206.ebuild 1061 BLAKE2B baddd36402c3db59a937daac681c9a452ec528c37e3920f260367d8f66edade7827ac19d6682ca132c2356c5b82ec6a451334a9e3f2d8f1db9c5219d1e9f874b SHA512 b1a6a701ff9a2ee77a76fffc4a89ead2c8dd6c5fb52c94800a2010bd1ad5cd7b5249f6854ad6657706af348cb84ecaee56bca42f0b05d88aea6e27b78a99deab
+EBUILD hteditor-2.1.1_pre20161206.ebuild 1068 BLAKE2B d94a17ac8875eb98076635527f89bedbec8016e3209706dbf6beb3a57b9ffab1899ebd92adf1f931dd4f9c1b3ee4aa6e8bd839c911181cda026b0b43d87e28e7 SHA512 05fca46f987055a7466a9c2b247e3b74c6b93ddb4a50b5187e39cf3c6df03861124505be8a262779d3281da37dea6feecda2b1457e79d48dda9a429ca9823076
 MISC metadata.xml 376 BLAKE2B 95d795c64db08ec029ca3e697d144fc92efa003e34d08b5e47143fcce22c53bde664b17147c88d55e21cc1ed7999c83f0c3e77e6528147d4b47b1c7ae4b86f83 SHA512 e728a6956ccce1324699fc0c5496cb5428f7a1d130647a3331be2e21f89cc9f21fa49ab412b9b0a48f993f2e3bcb601276f8124e0dd38ef656f3dc0cf376dfac
diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
index d74e18c724cd..692fd2a49ed7 100644
--- a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 5d9f663ba777..011141d0a0a4 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -7,5 +7,5 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r4.ebuild 2377 BLAKE2B 79791f5b50bcdfc1ca82ecb2dabb212cf8c4f33d3afc5894445a63d3c5dfb3ef6e69f9e5386869c91c8e10b083f480d528d0e144101bfcf35ce063d43d348de6 SHA512 4636f28229dfd2d0db5473c4ed1208017f7ff930f1565928cf8172fd763b3fe233f5ef4bf6e6ca4b4992cd45b6978c071477a85c0b1793bea37f18005b325d2b
+EBUILD jasspa-microemacs-20091011-r4.ebuild 2384 BLAKE2B a1036cac6352b70713e72a5a51c351c28c84cb11e92a519c5ede0949c64677883a33def7d822626947e1c6466bb9d3e1368ebb48923c6eb4adb4367ba9bfe41f SHA512 a751cbae23e3f14b01255e886de9d235e3af80cea5a7c391f1564d0d72a0c4cb72a8f039cc3d4e224a18039a71a77957cdfed9028b5f6774f12fe29a2cb22fe5
 MISC metadata.xml 1095 BLAKE2B 1cd95eaca94273179dcbf405b1178796c51e66d8f1af2253236d432fd1ed37d8d7019f3148c6821d0e469435e639541226fe4b6b3d575b1235bfa9fe808951c9 SHA512 56a2346d6b294d93061c9af1ed6ecf5a1855b20c9c24b4dc28a2f7a05e74dffb5b4149a4c3889469f7475d34cff35732f5291d66ffd57892569a291b4483498b
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild
index b6d09c14ac20..d883a6eaea40 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/me${PV:2}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="gui nanoemacs xpm"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index c61bb960dda8..8c6fe17751a5 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,11 +1,6 @@
 AUX joe-4.3-tinfo.patch 1063 BLAKE2B 574f78a31200df60dab81fea278bb238fbfe0a2b3f70f1f9a2ed78f3ae7a6e7a5d979fec61ad3ed9934aece27ce7836730e7f9755a7f25225dd74928c5454694 SHA512 93db2de58d2a03412cae7dc2b2769103f3ad275b68e22d6e3379871155656c8d4d4f29fbf014c6c8eb5b70ec234189af52a6b6b6826bfde46d6ee93b92f55bcd
 AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
-DIST joe-4.2.tar.gz 1341048 BLAKE2B 112163e67311051dad8714e19cdee1a11ff3bbe297341c89a4023f7d68fac7eecde57d1d522f72407b0a77c227c7af424ce20567c0c47dea6c14ac41f2f2301b SHA512 7c34f4467d89330ac195cfa76481d9ede4ee3764d0b1b24d091d1e6325bff451d2a9bc9f86a73404c9909587bcbe3e0c14511b739ec121edb7595ea1fcba028f
-DIST joe-4.3.tar.gz 1270523 BLAKE2B 442e05dd29a0a8d4a26500c89a2cafee88bf2d1ed00a4cb539d940e2e849456e6c4c5bf347b4803ee02ab38311b225cc8034177a1e0b7a1967a2629fd283b7e2 SHA512 a711ce129518863856b8f581ac7acdd7661f5e571cb77c5411317e0db0344c9ba44e73ec2ca9a307e639170a7914d53352eebcd00a33c9270809551f12376e69
-DIST joe-4.4.tar.gz 1350062 BLAKE2B eb58117e313ef4abc31026a2800f2b9258c12d0d865c768138ec42a97c1f7fedcd8e397f7aaf13f8bb3776f2571d5a85e27ea7f9a6fbd6710d935a2b80afcd1f SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d
 DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.2.ebuild 1147 BLAKE2B 8678ad20d1dccbff057cfd3a0848f8b31382b47d221ed289c9c85b18e81edce0f890432efacb081ee7fe470295efd72e7ca33c6d4e9deb733bf4b228a1a7f7e5 SHA512 c813ff926b3cd19ba57c0917c857f5482c78371f0c53fd5e7ca02103bc8a78307f590b10f06addc73c1a2a682434a35244b71048acdd2d2e0c7ebb25b6f6c4ac
-EBUILD joe-4.3-r1.ebuild 1280 BLAKE2B 57aebe95a494218e0594f3d842ba6fb126496f19b3ba9fae3d3976f981f21677a3765ba54bff15b006ac3e366f3af4a78ffb22ffcfce0223fa81a99b8fd48790 SHA512 7235c4fd3909e3dc2cf0d96051182eb2859c379f4b2dd7b95c8eeddb36deda8556bfc3a5a2b8932728734bc0b2e1accd7938f5f31a2e5feda5967f2cb85a00b7
-EBUILD joe-4.4.ebuild 1280 BLAKE2B 57aebe95a494218e0594f3d842ba6fb126496f19b3ba9fae3d3976f981f21677a3765ba54bff15b006ac3e366f3af4a78ffb22ffcfce0223fa81a99b8fd48790 SHA512 7235c4fd3909e3dc2cf0d96051182eb2859c379f4b2dd7b95c8eeddb36deda8556bfc3a5a2b8932728734bc0b2e1accd7938f5f31a2e5feda5967f2cb85a00b7
+EBUILD joe-4.6-r1.ebuild 1448 BLAKE2B 9f0ede46afb9fbdf35e7c6acc358e14bcde13c8e75af5d504365189f10089bad127035ae0b2db2014e4809ff1b8aa638de65f7513b1d20ce6093da7b46a4bbe9 SHA512 231336f2f5c7c3b6e33f38ebdfaff941b558789ba248b4d06dfc73946d2748be00f6ed00b8a4e4d7bd73be38963903109e4947d1fce5e174e0966891d5f4e8a8
 EBUILD joe-4.6.ebuild 1451 BLAKE2B 22ead97178fb10352f96dbd1626621d952a44de87425a9d7d3147b03c2863469209d7b320d0da3fbc2b2031e7737d78195121f3137afd30af8b60e53d933eca5 SHA512 593767e422cc2ac1c6d8e423919cd33b5b679192d2952594e3309fa7147cb2df395717bd2c34903a9aca517b764644e2518898155d7eb120d520e3fa4943e405
 MISC metadata.xml 915 BLAKE2B 550fe334d2253e6c3a707f75905b2af3082bea436348a48da9f55726ef5399f97a8b4efe29ae9b174576bde20cd89fbdc9ce88e13459d236a0cdc18592f9721f SHA512 b773c1fabafcf36ea1106610da0b3e9d10119352a663871f9b08dbac19f661f46c80e9a3cd5d4ab69079e8d07f4dc5e03f513b6ad82a5a879c2725ad88296d1c
diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild
deleted file mode 100644
index 4a399380f488..000000000000
--- a/app-editors/joe/joe-4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		cd "${S}"/rc
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
deleted file mode 100644
index 6f21f2fe2ff1..000000000000
--- a/app-editors/joe/joe-4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0="
-RDEPEND="${DEPEND}
-	xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		pushd "${S}"/rc &>/dev/null || die
-		local i
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
-		done
-		popd &>/dev/null
-	fi
-	eautoreconf
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.6-r1.ebuild
index 6f21f2fe2ff1..efcc6cef6153 100644
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ b/app-editors/joe/joe-4.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools
+inherit autotools xdg-utils
 
 DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
 HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
@@ -11,16 +11,19 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
 RDEPEND="${DEPEND}
 	xterm? ( >=x11-terms/xterm-239 )"
 
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-tinfo.patch"
+	"${FILESDIR}/${P}-db.patch"
+)
 
-PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
+DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
 
 src_prepare() {
 	default
@@ -37,6 +40,8 @@ src_prepare() {
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 	if use xterm; then
 		elog "To enable full xterm clipboard you need to set the allowWindowOps"
 		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
@@ -44,3 +49,8 @@ pkg_postinst() {
 		elog "architectures (see bug #91453)."
 	fi
 }
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/leafpad/Manifest b/app-editors/leafpad/Manifest
index b457dc8085c1..bb379499ea46 100644
--- a/app-editors/leafpad/Manifest
+++ b/app-editors/leafpad/Manifest
@@ -2,5 +2,5 @@ AUX leafpad-0.8.18.1-fdo.patch 557 BLAKE2B be91b5e3c6159701303254d6c7c753dce3b19
 AUX leafpad-0.8.18.1-format-security.patch 821 BLAKE2B 2b26cdc2ddc6cd0047c40fcf0b4c1f4bab4aedd422169ccfcf88c58db60320f7fa75367ba6a6d46ba9fa28c6d7275f79dbadafb393e0e7e8f78352ebc7574c03 SHA512 d8a39dc2412055a41eeb7966ff7e3884489d584726501233f67d8d56bded6e50467bcc60a4c2d0be972c0eb6732d9bdc7d00f69845737b049e8b0cc046f87a64
 AUX leafpad-0.8.18.1-truncate.patch 590 BLAKE2B e12eec5436ba8bf2972a8e0bd09fff7a762e14a9a6a5ffc12817e6c051e6b702c8fa0c0b3fcc554759e4f88d58614f63956d3f4cd9580c7ba09d9a8f65892c2a SHA512 f2c3fcaeeeec9eee0dac5088c40c675deb2b01f313125443f76a869741dab5f88ea181a6b29b8f6ad1f8bbb708887cd10ee1162e121ef5029a4a43eacf14a7fa
 DIST leafpad-0.8.18.1.tar.gz 289117 BLAKE2B 41f01f9b9e031c749a4b1a06d32edbcf9b0f0a694141c79bb462fce29d59f87efa52bc4a7faf270ce28f04697deb6350fe4e26317d28450d7d785a01007c06c2 SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257
-EBUILD leafpad-0.8.18.1-r1.ebuild 738 BLAKE2B 7144077b2fec98da4c663766feb26b16289b7a9ac01bc193384002401a6d50c7123b32eb85dac12f36ec4399cd671504c942797accc2e2a27f28cc912bb8e9bc SHA512 6746d97e5321ba5f374a62cf09ff56911738f4c8c1c443e230dbf824ebf69e9fef5074ad36dfabe49cefded0ec28d3caadddd591ad60a7673214c1eb85cda7e8
+EBUILD leafpad-0.8.18.1-r1.ebuild 745 BLAKE2B 19f32defed6d54e91d172fb1c3204afd9631f8b421899d3996dc46b1aa578682bc8bc33aa6f29a19b7e670e594e9efcbebb22ad3b08d01f8d808ed8d095b22e1 SHA512 7e661e5924e9ade85e95f74ad97b33a24b585cef2990b509bd716e36eda0ed717cf74a7c408c40cf61a204bc773856eebf49c16ba1d0fe9ca49c232dace6d4c7
 MISC metadata.xml 232 BLAKE2B a731fbb31073fb6f6f72757a484b6af776a1f6ec9d22122e2bcd8e9f73d14f0250fd1369603ef992bf4a8be0b30e20b3680ef078ae850e55c7104c479fb906fe SHA512 22594506a9049d69487673a2a071982153b687ec89d0e0b8548ddd75962c24c96460e1386cae8c4314336db0243542007603fbe31c7b127f468adc42d4e5dcc5
diff --git a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
index c53c582660ba..c451a3b39dbc 100644
--- a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="emacs"
 
 BDEPEND="
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index 99603dfa1028..f23aff2f9498 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -3,5 +3,5 @@ AUX lpe-1.2.6.13-make-382.patch 797 BLAKE2B 548091708e01e3baf9d52eaa7f8638d870f1
 DIST lpe-1.2.8_p20210401.tar.gz 840016 BLAKE2B 81fa0b1c3f9a7164eb219692a2e7bc092d0ee09c9de15f6fd2a4f66cc486be5b744eaa2fb0569a9f44f45d6a19159c55286be76d9ae0f4947f5b7c749e84a8fb SHA512 0b40f2f3fc1241e07291dfdbfcf2466cf5dedc1c91bf36c4f36c8af792ce718be2ad66884b049e25d7b9f9e796d60ce25ca42b37610d26894cd1dc6b74e51157
 DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
 EBUILD lpe-1.2.6.13.ebuild 1269 BLAKE2B 4f7a1a3d6518c184ba76f39b4dc427430eb8450feb3a91e736f81448afdfab2e59b6dd3c8f0bff2c7f08b1d4c76c42046e6fba0a5e72865d9314afc8c53c3ea7 SHA512 261ffa5abdecf4d522cfb25eb83333af1770a6d919ec9d99717dbf440bf600500c5b9653ccb18a373f29f3cb4c737f20e464fb6b3be17536c56209a1de910ba7
-EBUILD lpe-1.2.8_p20210401.ebuild 1597 BLAKE2B 92828a1a13c97057f0c92aa36690276fc092499c816a86340745e2cb097eb11c7cc36b30f0cbc2e11b61239423883c134695b4fea14748c43e153ecc61404080 SHA512 5a39b79fc6afa1ff917996304fc719d9f2a3efff2aa3ac09d7a50b3cbf8895230d89d52b54366a4a42e4e24d9e282f4132fd44e4ebba5d72db3c2904efff829e
+EBUILD lpe-1.2.8_p20210401.ebuild 1604 BLAKE2B bc4bf2bc00a5d96d2e3f276907cf56c5c9e4656b810b0298c1d3f52f3832172f03020600a573890ad3f08703abf6ac212ecfc86091a871ca92b5d730cfeacd4d SHA512 60523fd8e2ea5d497c23596d1b9306543de211461e879386ea66b5298f4a9e1b86e4180504b013acc5c6c75dfc876a3cef754cfc53a5ba06cfe2aed4dd18f00b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
index 23557f0d1a8a..5c157e7146ee 100644
--- a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
+++ b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-linux"
+KEYWORDS="amd64 ppc ~riscv sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 0e08704597b2..e1c5996ac5a9 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
 DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
 EBUILD mg-20210314-r1.ebuild 1047 BLAKE2B 58927b004dd4d86b0b265c81c4143c3f5c89f40d68c8f97af75696885c2cfa1aa2a6d4e1f72507b30a424466e7da47ac88b66d9d0d17652f8e47f9cbf791122c SHA512 77ccf850b2e25689630b8b04a3bd075f8dd1c2852a4a5a64a18b846443ca4822045986e4798bc21a45512d8ba456b4ced44a0af6a6a047a117a0133c4a06f90b
-EBUILD mg-20210609-r1.ebuild 1087 BLAKE2B 69f2f251a76e166321ca92817912d2e6e90b5c25bbc04052a77ec6c24262db52763e5fd5e15abb3382a7de205b2c2678164ade0b45a88be6200a6f3752e4e5b3 SHA512 d138e6c4702a8570469ea60fbedd0ffd6c97b2e965ce751950725414ddaa845619aeda68c4314d0fa9a7f91c444a591d3e5237207ade9c55bbe25b3e164b19dc
+EBUILD mg-20210609-r1.ebuild 1094 BLAKE2B f2f70b7cec2df275771132ba314dd5d63816c67f01b8b3f3b28fa695b38f8d97feca7a832a67cd8a6b5ac4214d6ab56a123c815b8f88e07f9b4b4e3b5683c43c SHA512 ff08db9441685c02dc8428e3fc64b3c525c063df07709bb1c5c251d670f0a7bd7377fcafc938f41f3023c4980953a0c22a64e2dca9f0a1885862786a2b7aa369
 MISC metadata.xml 619 BLAKE2B 746ed0d179b4fb8e40533411d3248b88c035a2f01ea6552af8e9bcf3d588a0e6a835ad12aa03a27052a7988646499538d991d05eb88c0125f3fc7d47e2ae217e SHA512 a1c066343bff1bd451d44850e8dd3f554fb330116a7e91b5a9c13f4c33e837018f81a9e77e1c9856651c877352aab68fe4f80f05a185996cce7eda91c45e6c8e
diff --git a/app-editors/mg/mg-20210609-r1.ebuild b/app-editors/mg/mg-20210609-r1.ebuild
index 55c7cae6f7a9..662d780e5fbf 100644
--- a/app-editors/mg/mg-20210609-r1.ebuild
+++ b/app-editors/mg/mg-20210609-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/micro/Manifest b/app-editors/micro/Manifest
index 85746a58df05..6fd2597361cf 100644
--- a/app-editors/micro/Manifest
+++ b/app-editors/micro/Manifest
@@ -89,6 +89,6 @@ DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.mod 109 BLAKE2B 08629b072202d338d461a
 DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.zip 36857 BLAKE2B c4ff2a1bbc2dc984fc24065f71b560cbdda220b78d88cff9ed5a91654984cd56c9e85b64a416c140e4b01bfda75734f7c77f882e3fb45a0227b3f47cc02781c8 SHA512 94b70a83a31acde7232223ca82d6588716b39d6463baf5f15d921a5bc24a7d9b98307b8d44d3bbc9a5a82f6e4111b2b9ba1c15ee313a3784a30d63fe5d198bd3
 DIST micro-2.0.10.tar.gz 814030 BLAKE2B 8becaf7caa167747443e1aa3af32e96588af275d2b921fa88fe9d55b4eec22622cf7a68d85d47834159042100414855c5bb3f8b9f7c8d934f762ec63f4d40435 SHA512 06796270a6d99578ac36f3313dffb6ba56c5e8963c6b59562b4ef9e65036ae2ed21ce602b39ee08d2f3c54c501089166fdecc5719a1ca535d84960b3b4b67f72
 DIST micro-2.0.9.tar.gz 811560 BLAKE2B 2e461593e71fda69a6f75e5adfaedd7bcf052b8bda9899f03a1e25e3db3bb8071bec80716d14a0ff7a381728871f0705076ef69e4de58f40499a7501343b4063 SHA512 5dbf81deb734618ec0a8ccaffc65f972d8da1d28b761c31bf3f5433c02ad6daa2360b1ea825c0a2cfce2f8d31d6481d468bbe29b42e1c96083c7a941fe42bc3a
-EBUILD micro-2.0.10.ebuild 5241 BLAKE2B 4f63d3e5e2131645777f2e120e6bec8b9e6843b33eb4dddbf0e51a553e91788eeec6740ab423ee1eff4f2c8cbe45b4752c4f7ee19a8310ecb069d6441a96b8ca SHA512 dcc7a1c6d5c7a1be227a0cf90909452e9ce561496d19e13d5f5df18d814dc8f2099a79da66e3d0e15dcf7e7585bc5234da03e5fbe102bf9c4d769cf1df34bd1d
+EBUILD micro-2.0.10.ebuild 5248 BLAKE2B 6ef6a47ba7d80321566d784d1f1d74117119fce6ada2b29bda1b28f61344d598d2f4dd5dfe45c61f9b8642213e950b72d4f42146503d0d476bb425c8bcece8a4 SHA512 369085f1d17b5a0986251906b7ee59aea064c97ef6b801226c974bf3d21ee720ba81581f1e7827b6a00dfd0dcd569b3185c6dc2db55672d6e6befd1c11af568a
 EBUILD micro-2.0.9.ebuild 5086 BLAKE2B 9a7639739c02096aaad13dbf57f0a5b661e5d823ef9af9c8540c7850abfbb975f21566785bf77806e338e70852d256b25a158b1ecc7c450998b66a3e1553dd47 SHA512 85f8224d341ea91fa0a41c87856a69e555ec5685861d2d7fc75b0c57e6285d1e2e8677e6be5905f0a0f8cde43f293bff139b0ed4c3c062dc8a4eaea30ce6d3bb
 MISC metadata.xml 471 BLAKE2B f6487317798718fbf48883ece7a99354ffe1ff88a82d16545d9d27582c679a1c18b3cf9c4a2f39a84a329f3ea272250651e901f1ebea12c2522fab03d565284d SHA512 b3a71e979bdaed4948c196a53b69d9d43cf23bf266e7a03835a83bcbe942202e5c2a14de256574bc8462f94b3211523444bf7c3b5fc4fe2772afbaafaf3346b1
diff --git a/app-editors/micro/micro-2.0.10.ebuild b/app-editors/micro/micro-2.0.10.ebuild
index 330643ba0fac..b81d3fe66bf9 100644
--- a/app-editors/micro/micro-2.0.10.ebuild
+++ b/app-editors/micro/micro-2.0.10.ebuild
@@ -105,7 +105,7 @@ SRC_URI="
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 BDEPEND="dev-vcs/git"
 
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 556fc5fb9305..49e90f1f2935 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -3,6 +3,6 @@ DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30
 DIST moe-1.11.tar.lz 89532 BLAKE2B 8479c8bb0504e614b4ad87e47ae89d1f0eb23141ff71ef3e46eb316424dfe87150f2d9474e1dbd3510fa9b1da517bd6afe47b2cd36f1aa70630b371f0f6bec3a SHA512 147f3500909739371290fc2f703ef5fab286d2ca385f6808ee3e0cb1cbae2ed58a0b5046d30ad5d24215dc28d77f0bba4efacb144c116209d89d023e731e8a39
 DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
 EBUILD moe-1.10.ebuild 698 BLAKE2B 181da72a9e3b4af805e8682b3fe6ecdf4eba42fb6ed0bc6bcf381dafda7624ccf0d86c1ac67d509470dedc25c6d2e9b9d348721fb34e8f0417e651faad70ee8f SHA512 5f53a824ce1e7e26e937327ae07182d820ba32817d5c3d1681aaf3ae65d03f0ae93fa117a5b41c7de6a27de5b295a337f096a8765a38d6e716580af1ef1a6df9
-EBUILD moe-1.11.ebuild 702 BLAKE2B 5ab0ae5efc2d53174fde0e418c3ecb7d0b92d1ee9acb57dc388b76528baf2038baa33e030459b20bde5f58d4effdf4ad8a1823c2c8fde9bd764e2c5ae3d2f560 SHA512 8485b0f31fda3407ef3569c7aba5b3f6b0c1452373651ae05901bbadfcf6b54c92165dfb0aa1616bb345ec8eafe6014aea59f78be40cad41a73472a72990f3d2
+EBUILD moe-1.11.ebuild 709 BLAKE2B a758a2ce28cdefa10cf1fb575f3b2fb3eb088bb581918ccfac404cb12b75f287051844e68c0f0634413784604df970a3bc7d018f3fe47cebb87276bb4b2041ff SHA512 b4dbb93e20d125db3a3df6f7648253c2b74147cdbb3bdd3161f9fa71ffdc5a70d1791cdff7fc8de79041dc22700948253d5b8cf17cfe763d0223ac1de198fac5
 EBUILD moe-1.9.ebuild 702 BLAKE2B f8afc91d99ae88a4bf8c5b02393d10124466cddb6179eaf9c12300076d791a28ac0f3ad6dca5162cf58cfc5157cad7ede7af7c37cd201d216922d8fe44740aa8 SHA512 9e0153471f02bb31d039e6ec986352bb20bb0386296b5c1fd610c9b6140d32fe996765a5e85b362d310f64ebc7827f069519d6fee73a69f11df4c01d5cb5d10d
 MISC metadata.xml 248 BLAKE2B dba7ab19012197ff483b3c5febb6e1eae41d23999686b287a45c38e89ff7565454473fac44579b1e367345933bd749897f8e737f50eaf024190c42069a3d4d16 SHA512 abd659f01838c035f4dfeb2c13e95a0e8e249b41d093af54ff31b4d87bfe03ae472e911a20ff0ad3ea6bb9718dbab822c8b7553ac0a7a59c1d09db7b4d910ea9
diff --git a/app-editors/moe/moe-1.11.ebuild b/app-editors/moe/moe-1.11.ebuild
index 690bdeff4576..18bd0460ec98 100644
--- a/app-editors/moe/moe-1.11.ebuild
+++ b/app-editors/moe/moe-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index e77a7221335b..b959ad33e0a6 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,5 @@
 DIST mousepad-0.5.6.tar.bz2 916738 BLAKE2B 59506a5eb362259889e580de52ed3135c339da4148dc1c99d7c7e6aee04d776f7ef67959a54aabfa29b7b174279f205cdaa0932199b407528019def24c4915c4 SHA512 24e974f793fd8660d39fc00156f8f8f07bae44133c6f58d705b1665f0b8d333f2248a6780b48794edb56e7faf7f206069a7866f76cbf91f6ce6b8b2ac7121f34
 DIST mousepad-0.5.7.tar.bz2 920371 BLAKE2B e019427316343a528786fc973b9aef4c63b5368140894212faea767311e6a18029aa093a9ac9f9ec831d637e0d8568bb76215a7c760162015309049b2ee10418 SHA512 0302fbf0d5e7ffe20a7f712dd0dc5878552572ec77798ed329b0e5688c0d4f80c5aa527f9fadb2de7452c8983bf1efd0e117ed7c170b0ca79e09006617f357ac
 EBUILD mousepad-0.5.6.ebuild 863 BLAKE2B 02de904b60dbf85fa7f8160671d1be6fc48590b9f6acbdf8112398485d6f367b9d9e6e8bbf041f75887f3eb49071f530d5d8342fa67c207113b86b80cfa2d58a SHA512 de8269ab6791e78318a257c9e52678db31e996c2bd0cb37b36dda062dbb1ec33f243f70f365cd2690815241bf7021b80e9ab866bdbbd9249d63e484cf13facc8
-EBUILD mousepad-0.5.7.ebuild 865 BLAKE2B 6d8b99afce428bd8ddfe3b9e170aeff47c2198ae5be94f5b8b0fb4a5051365547150a9819d3ed948df2b4330e26d37485bd4bf7d143fb5836a24beca29eda12c SHA512 c33da95d6f6ef47dbdb4b10d4381a95259a19d7e33d8ba6895b6749a7c2efca304614aa05dc394f6e005d4dd89d951eb83dffbeb336caf491791db09916e456b
+EBUILD mousepad-0.5.7.ebuild 872 BLAKE2B 49ab1136a3a2fd6b23d3584d288ff381d95e0091d38f87609837a3b7d2d91542a435329b8facc26f319de96376dc5eabe68887fe30e8a903eb2760766cffaef8 SHA512 746c581cb8391cdef76e9de6462faab71700a9dfbb5976fe6c5121b98c55e435f58e8fe0730ef201835de58bc1233441bfa19e5a3d82d3007132055e822fca27
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/app-editors/mousepad/mousepad-0.5.7.ebuild b/app-editors/mousepad/mousepad-0.5.7.ebuild
index 1dee543de886..e2ae29f2f03f 100644
--- a/app-editors/mousepad/mousepad-0.5.7.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND=">=dev-libs/glib-2.52
 	>=x11-libs/gtk+-3.22:3
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 7c7650793b52..183b8543b394 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -2,5 +2,5 @@ AUX ne-3.3.1-respect-CFLAGS.patch 453 BLAKE2B 70436e0380dfad01abb57a28b1ce5dcc44
 DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919
 DIST ne-3.3.1.tar.gz 1138072 BLAKE2B 8494ff955b456bbac2e82823ee155980f8fab5a1071d0bfd6a987f1ed0724129ab2ecb70737547836b592369b45daf5e499d50d7230b04c5eabfd1536a56271f SHA512 d8c1d8cd9bbafcc7c8c485ca4454d6979be3d33ae918139865ce5f76e428f165043707c95c2e440bd9bccd00c67ce81a41f87f94b85cae3518c4749233718123
 EBUILD ne-3.3.0.ebuild 1091 BLAKE2B 78860027854e0c4e21491f82c3a749775553ebdda8da81f72cdcc543dc44bb969f01126347376ef2df50663f7e9b0635ec9c383314177871c9ae4f971cee7d4d SHA512 2fdb544933a70387450e0ae2e601cacbe3642f3a06f1586254196738745390fac2086ac0b982674a209655478914320fbda1e95e9628c06ef4e8373a1e1c4c75
-EBUILD ne-3.3.1.ebuild 1171 BLAKE2B a286862cfcfd4c6e95736bb3ea00e1537a4354587706314c4f0d7ad4dee0e853878343b56284ba6cb5e87ffe82ce0ed1238fa4996a46436d7a20f7f5bb3e9a2b SHA512 e4d4eb366a9982325778750faa66505852fd9a7dbf29f5af8b0a20436f0c351381cccd3a17151c9b582a207b18a1f19eaa4b8dd5856b08fb96bf262ec530fc1c
+EBUILD ne-3.3.1.ebuild 1178 BLAKE2B 02a0735074b5779ddc5eaeee498ec855e42691dd1ac40460a4f0340e883a20ed0abd73955b21b5fee4be4498ed8738fd517af761125a7ba00e2e69b939ddae6a SHA512 dd2b418676fcf1d3f51fe80d6e1ee4081a5f8cfbd6964d245ffd394124cb6daaa16a704a248380e34c0b013e801ee2448834ed586315723f656b8bc15fab65b1
 MISC metadata.xml 241 BLAKE2B f2a34a0b5cd4a0d080704beb40861ad791adc8bb9247b6f2325de22149c64014255241e7f52ab3fea6cc3297c344ee45a9be9fdc76b665bf5e098354cdab5345 SHA512 b7184fdd7455ee5c40cfcaba2405c7d7627abb2f04e298a098656674c101d2ba08e8522a5614a1968139e4beddcb35f0e22c93dc7c052d698ce0134409807315
diff --git a/app-editors/ne/ne-3.3.1.ebuild b/app-editors/ne/ne-3.3.1.ebuild
index 242892b33de8..6fa202479207 100644
--- a/app-editors/ne/ne-3.3.1.ebuild
+++ b/app-editors/ne/ne-3.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sys-libs/ncurses:="
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index f05fe77ebb07..69e12e207fe4 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -3,5 +3,5 @@ AUX nedit-5.7-doc.patch 522 BLAKE2B a52ae4cb7d9e2bb0b629024a0e5caf12e54f56905ee4
 AUX nedit-5.7-ldflags.patch 814 BLAKE2B 5d300f5006c41ef378d4cadfa2daa287034338c7e8cb692669873853f1082338af7eb0ef4295c823dfea7eb17f0920a9eace16f04c05dbdb6baa495b21e207de SHA512 2e72fb97f2bad7aec225cea2a86b2f0c40e22b8604bdc0288232df3b304c6a28924bf45425bf0ce3f3c753f7d2fb0133adbe041ff747093e2a6207c86378bd9c
 DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932
 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
-EBUILD nedit-5.7.ebuild 1979 BLAKE2B 036681479e1073513c50afe5f06046481a7444ff6a167a83dadd1dc2bdb7a211d5850f5bceed21c01587d023e66353a956695049fd81c2a3ab97a4da6417dcf5 SHA512 82947270b1fdb7efea14b7de7bfe708ac6b17d7fed37444ac23a9ce79c0b66481cfb41e32c71eaf9746f98827e15829333bf2099920b439ed4b51fa9f9f3ee32
+EBUILD nedit-5.7.ebuild 1986 BLAKE2B e2004f7627c737cc4cd3930ff4dc615de6c1d4bcec6068495b3d1717f24e961e6e81aa23ad45eef2bef862d4045d8ba1f1a6677e7377fff9011f2ff89484a36d SHA512 f35f4e86df9de7d616f16bb97cd49239d536fea8ddc737f1560aa2830b7657c89575d9c4dd623520484a35a61c4f400dbbf0068d8bce5f9a3dfb734cc13031bf
 MISC metadata.xml 293 BLAKE2B 1b537f53fcef360cedbc241bf4498f51b452dc8374ae42c59e820a32eb3aae862e3b8b143c60fbe9d7bc4c9205685d528d3549c58091222b77ea8c19c6b3e084 SHA512 36c040cab6586d73169cc2f8c98b901136e8e3992a456c3cdebac8c1f0032c76e7bd4ce65e33a47b81e23b0b3279acb3c8efc8f23677d645c4448c230970097e
diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild
index f8a265fc947a..5702d3b8f272 100644
--- a/app-editors/nedit/nedit-5.7.ebuild
+++ b/app-editors/nedit/nedit-5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/motif-2.3:0
diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest
index d062fb21b91e..49a0fec1cf7e 100644
--- a/app-editors/ng/Manifest
+++ b/app-editors/ng/Manifest
@@ -1,5 +1,5 @@
 AUX ng-1.5beta1-configure.patch 658 BLAKE2B c76c062312f36e59c4f31f6d24ab992b7722ea3f8d323954b4a3981acc708e751b869e5ce3aafd47869e3893effc3d5705cde7648bb948d7acb7d79d906953e0 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b
 AUX ng-1.5beta1-ncurses.patch 556 BLAKE2B 87321f8f920609a64cf356a45517b3f3328a204dd65c3fb02faf891c748d4b0dd9fb61814b13d6e99f75255b6b3f544e12f757ac393fdd31ff74a889e0fa619e SHA512 0c53ac22f5452af1ce59dfd6e2bd35868e824a922bbd4742ed20d9e2e24752c2fab52504b1365736dde04ba212c458ace9335a8399509d1043b686d997bfbfbf
 DIST ng-1.5beta1.tar.gz 662557 BLAKE2B 02f1f5277aaba279226d732351eb604205e8bfc030678551a5f2439bde61651bf5aa4e02e06f3283fdab710cc5a1ed9a3eae1e42fd4fa8a8145699b425c4e61e SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd
-EBUILD ng-1.5_beta1-r3.ebuild 1271 BLAKE2B 51430ead17e580a602aaa7abc8392c9e4c795934ab9e653337301c3c58bff3c112d2e19cec00e26fac23f7e8a90ee7358d1d86ffc422a66d2282f452bf49ea55 SHA512 efe5346aa34b4669bec5a88c8add2db33bfa254805245dc32ecae472a2ff4849986fa4c87df23da9acd76727a4c9d2604b8b91e58821ca3757180d09e001676b
+EBUILD ng-1.5_beta1-r3.ebuild 1278 BLAKE2B 6a93503197efa3261424058d95bf6d2530bf16a5ba21655bcd3eb5ae025ca1b823a8238aecddcc766fba6cbb85c680aacb382e801a2644620124e9c1b2c1f6ab SHA512 9d65bb61ff20048f2da1c5bc1c26143b8980738054763cc167c461ac77fd423716f30740e3d342efd75391ee965f122a8d99a3027582e255acccbdf98bd32684
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-editors/ng/ng-1.5_beta1-r3.ebuild b/app-editors/ng/ng-1.5_beta1-r3.ebuild
index 92a75d620f79..515e4a09db0d 100644
--- a/app-editors/ng/ng-1.5_beta1-r3.ebuild
+++ b/app-editors/ng/ng-1.5_beta1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://tt.sakura.ne.jp/~amura/archives/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Emacs"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/padre/Manifest b/app-editors/padre/Manifest
index bf6fc6883199..a8799192805a 100644
--- a/app-editors/padre/Manifest
+++ b/app-editors/padre/Manifest
@@ -1,4 +1,4 @@
 AUX padre-1.0.0-DBD-Sqlite.patch 1139 BLAKE2B e46deb29f997585e78f2316796ce2aaeb6f04b0b984f76f502e140873cdf872a42e26548dc7a1c2cbdefecad1be705fcae04b9f697e541476088fb9140a94d95 SHA512 a23818ef3bedf24a11e8e1cdf5aca8b0a3eb67123e796c0014116c51c2b2c7c55bbe50f04bc200650e3e4b34c519929478d4ff4b38b120a360d8d23438c36a4d
 DIST Padre-1.00.tar.gz 1969274 BLAKE2B 2c0a982b2addaaa8c2cf994c2aeed7985779b3c9663b3022c83a67ebc4a3d0c35fa7f5e6d0f7649cf9e47c51e1a01df42a977e03366f0f2b75c76964b4bf1dde SHA512 8a2630eb54944b85ec77eaf90595fe6bb482b88ae87622b9e54973fbc1cc5f7ccf83d7b2481a9a66886310db9678569d23b18de033f7759db71ac73fd3151856
-EBUILD padre-1.0.0-r1.ebuild 2834 BLAKE2B b195570fca53d8f09683a4462d06a138c867c7deb7ffac8de872c3c6de5c7f4d0e9bd88c57d66eb25c7a9ca326f998f7630ac683f143a6d42d45a368983d43ed SHA512 a510626b62b631481aa62b0d8c033d4229a7220d3f179e2f10f91ef50b48a9ba9174b2adca416c4ea153643269a83e172d13ed67d583f8b205f2ae526ef9ad84
+EBUILD padre-1.0.0-r1.ebuild 2838 BLAKE2B dde9f8e871085bcf28c22956bacd601714687b5c75f22582c430ac2d3d39bd7592392ac98f470c8cd948b9d2de73271e03a5597a53439a6355c75475cf10d09c SHA512 cdf3323c730a216a1d182aedb1106a1d6539ad65d8b63672c3a8055209a381640569cbd024244512891d2f60da918ac6bad92f63241a6f56c8df7f590ef2088e
 MISC metadata.xml 330 BLAKE2B 6ff025e4df1870d19283f8e2098da9ac06ad6ed76d39bed9b7844a1d4db4bb26751533f8b182e1c5ceb1e743bae54f371665e9ad7445031ad3592177b4481328 SHA512 bea09eef46c3ed1a37d249fcd87b35e4c3f8532772605093ab303c2fff8591bbc176ed2d0507a9a5cabd159ed7af6407a37b720b158112d2a4930168af8654f9
diff --git a/app-editors/padre/padre-1.0.0-r1.ebuild b/app-editors/padre/padre-1.0.0-r1.ebuild
index aae5b0669614..138b69cffcae 100644
--- a/app-editors/padre/padre-1.0.0-r1.ebuild
+++ b/app-editors/padre/padre-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Perl Application Development and Refactoring Environment"
 HOMEPAGE="http://padre.perlide.org/"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 # Test Deps
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 4417aeef57d4..05ef3f0ca283 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
 DIST pluma-1.24.2.tar.xz 3745160 BLAKE2B ed855b19f1ab80cb6ef9bc175eea3c2af386b1e45123bc0e3ad93d1964efb4822fe1b3d7490308357fcff96557bb6189f081a467f41a6907e76a1961de8f23d3 SHA512 588640744f8a0bec08d0c51c0309380a57cb6319c98124885e30d05e7dd8488ba7bd5acec1bf21fb0d6832626ae8925b24cd241202265af1a631a91313cdad2b
 EBUILD pluma-1.24.1.ebuild 1799 BLAKE2B a4f909e45cb6a62bda87feecf27d5115043e56bb2d2ae04ffa64ede7d40b82d06e6f8433547272671325c883d98853f64cfc38cfe02a3b0a718897b44f71483c SHA512 c481ac142c14ec80430080e4f54a25e30b1745da4e0f2d3dddbf819beb9a39a4fa83ddd68cfff9b6d561a5248c84ad5681bb962e039aed24596354397272eaf7
-EBUILD pluma-1.24.2.ebuild 1800 BLAKE2B f294a7b0b70aa8fcbc2f168563fff9161718ff50bf8dcafd19953d968d7f3d27f039ecbf76a9feb7dbbb20001ba70a6c5cbf55ec6ae435c5055becef753677fd SHA512 2626cc64b51042222cbbee391153b7df6200781a4f7fbb0cc6a642d8e0b8d434f758d97a39496c37a1bc4911e12eb5dc3a39051eb269d914aa397cb87106066c
+EBUILD pluma-1.24.2.ebuild 1807 BLAKE2B 32f03c3b63d198d062e6a42d77133db6a1924036978fec692dc55242b60798923cdcc80d4cc6fd4116bd7d788bd4af2bc8160ec17802ec5aa1314ddef555c6e6 SHA512 1c06521f6b628e691c1067c46fd3cc3d8d022a9fd4cce3fa1bd06ee30ee7d7865fcbfb60c29e70b64f42167d817e02b41ccbf20b4f118f7c572a80e38b6610b3
 MISC metadata.xml 335 BLAKE2B 5a43dc64c90fc154ee0cb55c1eba79a20c612836229ee87e1594436db64d3ba5d877897ecfe4e2e1b52b75a8a3c336fe5338b203e9d134d14b531de4ca2c3eb5 SHA512 8a113126ce89a38ce4ec7468a7c45b162572ceb034911624ed9c5227dae4dedf33ffdfae0ace99ed18848b1e30b722e05b0715fe845b4ad0b6998e4d87476548
diff --git a/app-editors/pluma/pluma-1.24.2.ebuild b/app-editors/pluma/pluma-1.24.2.ebuild
index 849ab407ba6e..b252f3c4b0e8 100644
--- a/app-editors/pluma/pluma-1.24.2.ebuild
+++ b/app-editors/pluma/pluma-1.24.2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
 inherit mate python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
index 0aa1b933cd17..666b47e8eb09 100644
--- a/app-editors/pyvim/Manifest
+++ b/app-editors/pyvim/Manifest
@@ -1,3 +1,3 @@
 DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
-EBUILD pyvim-3.0.2.ebuild 844 BLAKE2B bc26e36c80766ccef0ba23182d13ec76043629c942e08513c1327153583d09a9d87c9142aefcf53f374c3738f213c8322bfe297f6cde5a7e9cfac1977cdf3c7a SHA512 2c1c96163032704aacaa6414f3946328af026eec8d7a0d86ec289266b2b5c5eefc03c5d927c88927d2bb11ae25b1a2bbd407b808c76333aa8dcd50fffb312170
+EBUILD pyvim-3.0.2.ebuild 851 BLAKE2B 6ab8ba7e41e047c835d168a6d05f88d0ec2c03a6970a8e8fed38eb7402cfceefb917b83cd9f738894517f96f31abf459169ef25c9d324fef493d457e0e4a29db SHA512 acf99b3264f6549717c554cea17e48bb10f7c2c296f67368ff2bc8a9054f4b166bda8f400c3c2a4905952d3b7471396370f9ba281acae4e462b0ec14310b46ea
 MISC metadata.xml 490 BLAKE2B a4af1d63730b2d7d6621d0a6fd3f4205016a940cc47d84ac48a692aa2d27c075f146d6a3d2581558af19cbab614fe47d9f9cb3679899387b2dc84b6b0f52c3cf SHA512 5eda2f764c81d21304541fe5d8c8330535d94b382b8bb94e9d15f01c184d4e09a6780dfe3745d4e3661c56e5a5a564147fbd4111fdfdd12b7075e1b9ad06488e
diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild
index cd50a4a019fe..f91be2260e41 100644
--- a/app-editors/pyvim/pyvim-3.0.2.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	app-eselect/eselect-vi
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index c9f1d64370bd..2f417e7f88d9 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -2,5 +2,5 @@ AUX qemacs-0.4.1_pre20170225-Makefile.patch 954 BLAKE2B 16fce167962370753730dbe6
 AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c5706788036665271cffee46a4b896573de3691c3e8cc96db9972fd0f170033b9d85fb048578c8cf3502a53a5c4ad8b7c9858c0771e195a42 SHA512 1c81e3570a2d00df04fa9a4dfae404be2f1c684b9b86ef67aa3f13a4b6f734d99d768350d41c75dc8c2874ccf853d021e497c87c751d86e2df1015f42fe97889
 AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
-EBUILD qemacs-0.4.1_pre20170225.ebuild 1516 BLAKE2B 262a37468532c3953609e877faa7956818525e2c7d70fa18545fe68646e008cca6c9ff38406b226c702c08e3ff2c0f348e40a963e1331c74ca1207500f377f81 SHA512 ae3a9ca8933d6885614a3d590dd5820466716e9573f23f5720a23355a7556e6400f2e4eebb3c7930a7c5255da7aacb46b63f7fd867575293affd9dd7f61a2f3f
+EBUILD qemacs-0.4.1_pre20170225.ebuild 1523 BLAKE2B 2cb0eb2d3aa9061f6e4e71e04797e4cf12dad9ec0ea58fd1d43aa13a8f6af6b6a1cc913b5a97fa67e0c72e034ab680cfc316e2616d214233456335663d29c4b7 SHA512 a6b57e99ab0421357863d8d58ce0a8e9cfa49ac24b4ea6ab3b039680a5051bb8cd9078034f819bfc007aaf98ecc0808c2203e1ba1bcfa630007334a35b88d1b6
 MISC metadata.xml 1938 BLAKE2B c5293f8a3aeaf7f3ff131dc4067ffea4d4bf10708cff068dee871bb95254f9d5d60d97752e5c8180870a69f404de1a44004cb0174dd11d71a1adfda23cd6fe7c SHA512 24ad0431bc56a92856391904c28053b48da8b63db03d7ed1b643b4ea5b7f9c344dda47f340352c311bf5987a841f6fce514d3a02f4c0f745b6e51198ddadb4ac
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
index d64a4d89ed71..bebc3f453493 100644
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc ~riscv x86"
 IUSE="gui png xv"
 RESTRICT="test"
 
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 2834ff6c653d..684bd5cd26e1 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,4 +1,4 @@
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
-EBUILD qhexedit2-0.8.6_p20190316.ebuild 1871 BLAKE2B 0677f27b7ecf155a61aa44ba3ffba88e718b719daf52bfe8eb15600ee88b8499c83d471b8c0c56587b376cb6114bbd65f0276a5b4c3c479e9f93ffd12f76a4b6 SHA512 1b5e6033d344e946696db56eb4cbed80df84f595cd8293436964f5d375c0f4c2238d67255c57ba41f945b309b1b9f66b1d7163a8e351c3a0cce73e6c6833a412
+EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B 30755598bd0d16eed9bd853ededc9807bf7b344ff209a179f9da712cff3881b34d14a106f07fb53061a0b9f1abb40ddd7bb6814e88877e09b7320e3cc18b5372 SHA512 73ba1483c4f3a4a30b0048d8f9884044259d26ebe067029e4ec62f6676248bf8528ba9e59bc7f46497b145906bb50e032de6a9a52bf8c78e427f29b6b6ddd32e
 MISC metadata.xml 894 BLAKE2B 397b58bb4fe28c270c41d16f8bafa13e7ed2060ca258dd5300123e35e08b425e1eacc358c28d81d80cd1346c4bd1343682b2f3ca87f3df651d667b554e3c5bac SHA512 c075e21b79a843c43de157c77fcb3cf9081788bd37647f00c1cfc139366eb00dbf3870c1f95a5adedf365022f5930b31127c4196a028328bc144af40e7647e12
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
index bc6a9f42909e..a1d8c2148607 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="doc +gui python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index 3a2d4d7d6300..098921b78e6c 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,3 +1,3 @@
 DIST qxmledit-0.9.12-src.tgz 22582822 BLAKE2B 66cf57e8cd1cbf712c28e55ee39685ea907216ff397b9f6ad5307e768bbd22a16b1f32dbbd309ae186479c35bd57d0aa1a1d5b4e174d1230c3b52f844be7e9f7 SHA512 996f1a656c6191950eb18bd3df13574f6bd85ad58132b5662cce5b6538fe81597359d3a7f69cff5c252c2efceb749ee079bed7165b3c142d33e0c4cb500231cc
-EBUILD qxmledit-0.9.12.ebuild 1498 BLAKE2B 70e37b92885776a8f6e9e22a9f9eeb7a46b72da7530062f8708dd65767ee8194a6dfa98479ec22988d8075b0a2b161686b54939710f7ef31486cb5b3b2ae6ff8 SHA512 82e1fa241d3b54c3b595a03860429ca8a4162f8dbe4a698456bce29abb6f376ac0166e32e77cefb15351b02a9aca10dd060cb9c0be5a686a128576fcba716279
+EBUILD qxmledit-0.9.12.ebuild 1505 BLAKE2B 52512fbef47dd5e3147c9ecdcaa72d14c5f9ef6aaa78e62defe3b10e3a35ee5425102645ccd899313fbebd1aaf5e3777809941a28ea2bd7dedf085bd44c3bc47 SHA512 2ba74511a47122f60840429a2649ac353b4388da74856a193abee13cf71ab887f9af4cd23a0b89ee6ad40fea02306fcb91eefecd4e0957d8292026f8114ec053
 MISC metadata.xml 756 BLAKE2B cc1c42ebfdec0fbeab36367a97e6e4768422f76d4083c2d179c4e1f96911a1dfb5e4658bba9be2e4b84a9c869bf6977ea54abbe8547d6b9b88a3609a068ba992 SHA512 bf3c7888ac7bd206718cc2e8071de6731a96e5702ae514b543a5bef2adbc298c4d618d48cc34484a680cca99ee7ea68a12f3f9c7a6ed5e00cc906092e1342a0e
diff --git a/app-editors/qxmledit/qxmledit-0.9.12.ebuild b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
index 88123d4bf620..ba8f660a4384 100644
--- a/app-editors/qxmledit/qxmledit-0.9.12.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index a2983c760bd4..12ea2f2c4d1e 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
 DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcba18fcfa566d61ce006a44c34327686a8eb756f2195620e644e096b9393a7cfa73229aa0dab7d29ddf715edaa SHA512 1a375acb40792e3cae9f955a75ebac7c30c9e5cc719477989b28d8d7f06e18ad14d98f1a600a5b6d050b3276ef22bd46b5f1f07af90d561cca500674ff461604
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
-EBUILD retext-7.2.1.ebuild 1971 BLAKE2B cb9b7cab80763e63ee71842f311d0fe3ead40e09184e76daacc85fdc0a7129f2f230d6e81680de0c8cdfa3a4af078c497b736c3235ae126fa9cecc5f9fec2d62 SHA512 97224ae9ec06fde4a75817ad918b795045d14ba147a5704d235f4867c848f4f438ce5c977581b547adead13e7178d26828d8b0d4d1633d0180e6c8b1360011e7
+EBUILD retext-7.2.1.ebuild 1978 BLAKE2B 61abf35246d654bb60de706c6275f4b463c8d60c3af04201f7846b2d916ff2633d421d5d38419ce1aceb90689109b64100ca9554cda225dbb3c9676db0e70184 SHA512 e0feaa922eb61bf68b049f3b56ad5e7324ca0ece7e48d081c952cc64b0d12e31b26fe3d0212bdb0d28e9aa10daa7f76dcb4d9292b804dfb2eeb0d1ed46c5a21c
 EBUILD retext-9999.ebuild 1973 BLAKE2B a83f2e5da937ad51bb882b004313a649081e2bf7d19096521e6e62a9fab7dca755c511fc121a9293d0cf0d705c01ea0c31fc739eb500e7998ed677c9f08e29e7 SHA512 cad0fa71050cbd4446bfadbf1cae5575e154f1927db8e4147fb8065dfc57f4761da4d1325dc53cd3097043e635043d59c254ae567d86bcb86a27ec27263a0d7f
 MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c
diff --git a/app-editors/retext/retext-7.2.1.ebuild b/app-editors/retext/retext-7.2.1.ebuild
index ecca89965b21..8dccc7365c37 100644
--- a/app-editors/retext/retext-7.2.1.ebuild
+++ b/app-editors/retext/retext-7.2.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]]
 		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
 	else
 		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="amd64 x86"
+		KEYWORDS="amd64 ~riscv x86"
 		S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index b599fdcc46c0..21918b61b796 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -3,5 +3,5 @@ DIST scite-5.1.1.tgz 3374717 BLAKE2B b7a45a86008eb592adacc8fde90cb637cc7cac821f3
 DIST scite-5.1.3.tgz 3427245 BLAKE2B ca765b61cb1fa96934c1e28d76a97cd7086a6c692ae33bb57591dfbc8637ffc94c4a3f20f9c6b55d11da8a76664f1d521f7e393bf6f31db55cbe02e0bf5052ba SHA512 ef86a18f739062598d3c7bf19bcd2f38ca012e890b9b4685c1f1b809e928762ab60d24c33a1f45ca33133ce5007e3a22a76e80222b121c9a4089d3c57aa0bc4c
 EBUILD scite-4.4.4-r10.ebuild 2975 BLAKE2B d11639ddcede16d0bb062f824f483e7148799cb4a690a457102d5d85714eb4a271f200da5b76f76315c08de078873c5f5e9695245aca01747c41944d68a11f87 SHA512 8436c3c2129dc22ef640534214691a4ba56242ea784141f81f04f53a0f93ca7603a4f551fc9f08c074091eb15b6ad38fc201224d7eb7c6226cf78926eadb6d03
 EBUILD scite-5.1.1.ebuild 2897 BLAKE2B c86eaf29cdd5defec9555ac0a4314e3583c6445e4157b8d092d26971e97e67507dacf9b4fe64f951fe3adfcddb86bd28e4b913bce70bb2a707c0739564f76fd8 SHA512 8c0a33dac9495614ee71fe08c66f082499dfea67b820d2cf08ce49f6693f92d63c3ff967b22057eca1dd6f6b87f979bb08ac6f16080103b29625ab152ad03de1
-EBUILD scite-5.1.3.ebuild 2900 BLAKE2B d836630201e801fa18100bb6b0f1093a30c17cf91e111c5d5fc0909f37b1f89f86a9d4948f59112c275ed76b8236177368bcbbe4b19b99e553e677a6811d1dfc SHA512 281092e5f2b8c76391cbd82540bb12474edc62a5e614d787dfdb52f5ead3f455a5e3b7b90bfa64d6cf76e693344ec4c8771a5839905df53901eea57a382157a1
+EBUILD scite-5.1.3.ebuild 2907 BLAKE2B d60dbdfb24e151cbc1cdba51b3325eaf0f98e87d4686ca2ea53ca57313fe6711661254e8f65d7af6ec30b7d78235d08bc6f45d95d485e90244b16ef19638aee9 SHA512 7ad48179a71ba935064dc4b359c79e83bfbe271195be67aec680b82198b26df11be91491430cc56222b3992e2dcf5da0e6ecba2f7c59c64a18dd4e53e37bf704
 MISC metadata.xml 477 BLAKE2B 6b4ee233530c91bd81cb7aaec6533f9d4f917765d372e8e84bed225da07b0db5e94f00d34644d9496a3d7321c8a16dc6e65b993263901ab8e58b65664f50458c SHA512 b7329399a31e6e514cebc509b048943a4cce7fca1affc7ac9f401420e885d51a7af6f60d61bc5405326c54a2d1207583f066e3b77ab4b08d00333b6ec43cdc0d
diff --git a/app-editors/scite/scite-5.1.3.ebuild b/app-editors/scite/scite-5.1.3.ebuild
index d206fb1266de..54999f9fff31 100644
--- a/app-editors/scite/scite-5.1.3.ebuild
+++ b/app-editors/scite/scite-5.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index 38f926af5f78..e09e8b1c7b7d 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -2,5 +2,5 @@ AUX shed-1.15-cflags.patch 249 BLAKE2B 6249d526da1a4b1df8f456692e85bdbd275be7517
 AUX shed-1.15-interix.patch 313 BLAKE2B 423d51410a5371ee1fa0ae2e0d4426dddd410ea060a269f6d3c6b99826aa8d57635bb9a0cfeb82fcf2f51dcf179b0815485491110df3501d1e23ff950d838475 SHA512 31d403d95ce106443ccfe8c92b9621842bfc4264c71280398bb7c0d827d98bf28b403dce3c6ae4523b7ac30a8f529aac6d7cc30a91313a2e2a3d033766469e69
 AUX shed-1.15-tinfo.patch 355 BLAKE2B 5acffe509b9174187b4383f15bed90600790ed0267ee1dbc2713a28e2b8fd0a5eb67cdb1f84a635012128abd5075f9daa0ffdc86abbdd29d170a9b48868dd52c SHA512 fab71c3e99138f7cc4844964bbc40e95c90055612e6d34ff59c72b505b2c12c6244c4a25091de283f4615475652c202a4404273c0718b73b9f928c4bf0a74710
 DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
-EBUILD shed-1.15.ebuild 615 BLAKE2B f52252ffab4f6fe24b89617b791e7412f78e7727234ca3f64faa69981259fe7662cd53d62c6faf8dd165778c2bc0e985502955eeefcf589c9c4e1108004aaec8 SHA512 eabe5181002bc511845cf56f5d968b676ccf816e1bae16375417319f9a9d86e63716228c0c24bda33306ab7b65c25081377b805c504b013c20da2c2671dfbfbd
+EBUILD shed-1.15.ebuild 622 BLAKE2B 6420f56456a2d9b3bbf5ccaba0cb59348bad7ecad6639e1e896719383b53f2a8dd9de6fc259fea60290fa753f25b5839f53fadcf0154c12e97f31a8161c607c5 SHA512 d41c355f0d2295bce41605504e73d189593fbaa8e489f954da686469b487cc6115d0d14c257277ba590d150504f8aa2e9b49b061a116ab9b3728a08f78120c40
 MISC metadata.xml 300 BLAKE2B 69b60110ec73d584179b3397e62d84d31850b7be40f72bf5ea182c26dec8343ee0a82e3404b66a6a0246f3d2d096a0f698d840faf6317b727c45453ed604251c SHA512 18ba6bb46ac00df843bb53dd43d4beb86e275b61f4c49a9af547f305c447911b65c376c81038f996cefe1dab1b8e65a323cddb3a11cb02aca4aa62546e77a375
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index 3c907f678988..008b7b44e8ce 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index 5de7b13c06a9..3dc5f0ec5183 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -4,7 +4,9 @@ DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6f
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
 DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa
 DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef496e0b7fcf053be3349c8318e85373bc9c3d4d69da3e4e94971ae83832aa254c175a58062a33ffb14d2103c1cdb6888c1223f28ed SHA512 f0e5e8e28754c21bf5c9fc3e50502d22d72fec4819c68d8444cb341aa7ee4d6bc43edfda594fba3c446c2b252bd7a65340dd7a407d81f875971c219bb2236479
+DIST sublime_text_build_4121_x64.tar.xz 17181776 BLAKE2B a8404a15af67934ba5c2c038d2259e454a505592f53007f665a596554dd13e5c09729577520052290df7bf393ddbcb33321d1624679c4af3bcf5a07ac038f6a5 SHA512 809ef4acabe1e52918b2e7c6057623380b1c7ba5bf0298aa59ec06b49d258fe37fd7177a79bdc840cbc4228a7944cfa67847c3bf3b1b26b3c171815f80c59103
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
 EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
 EBUILD sublime-text-4_p4113.ebuild 1944 BLAKE2B 6ea2f6b0705c7a0f3ae083deb217c7421b75f809f34051e04807f235f2c41cb5f7acbc0e1b7f5859cdacd5fefc3e78b447861456b1a57f796518f9e8ca250634 SHA512 ac4e7c50496ee6e67366f83e6fadb78c8284cb1db640258f9249db0e108fe50eda02081c63e08488548d75ca12882646594f5515c35e30fbe9888e74c6b18426
+EBUILD sublime-text-4_p4121.ebuild 1944 BLAKE2B 0171c665702901ba22d1dc536a55157d4112cdfcb04fdffa561298e0fb75850a847b54387966e9910d5fa3a2da42b22c8caf5a55d1794fb88ac5eb6eaa59d71c SHA512 56ac4d5d09d1100557a170266ac42cf3603f122d709b58fb200a397d171c5222cd6d73271d72f4c24ca664e3a5966743faff56fb6d5f1a5984472023d12e5147
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/app-editors/sublime-text/sublime-text-4_p4121.ebuild b/app-editors/sublime-text/sublime-text-4_p4121.ebuild
new file mode 100644
index 000000000000..67a825bdb8e4
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-4_p4121.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+# get the major version from PV
+MY_PV=$(ver_cut 3)
+MY_PN=${PN/-/_}
+
+DESCRIPTION="Sophisticated text editor for code, markup and prose"
+HOMEPAGE="https://www.sublimetext.com"
+SRC_URI="
+	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="Sublime"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( sys-apps/dbus )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
+	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
+)
+
+QA_PREBUILT="*"
+
+# Sublime bundles the kitchen sink, which includes python and other assorted
+# modules. Do not try to unbundle these because you are guaranteed to fail.
+
+src_install() {
+	insinto /opt/${MY_PN}
+	doins -r Packages Lib Icon # /Icon is used at runtime by the application
+	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 sublime_text.desktop
+
+	# sublime_merge looks for /opt/sublime_text/sublime_text
+	exeinto /opt/${MY_PN}
+	doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text
+
+	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
+	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
+	# how the application is launched. This causes the WM_CLASS to be
+	# "sublime_text" which matches the .desktop entry.
+	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
+	domenu sublime_text.desktop
+
+	local size
+	for size in 16 32 48 128 256; do
+		doicon --size ${size} Icon/${size}x${size}/${PN}.png
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
+	elog 'WM_CLASS="sublime_text" matching other distributions.'
+}
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index 50228430d91a..fee9b169c19a 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,3 +1,3 @@
 DIST tea-47.0.0.tar.bz2 437273 BLAKE2B 8ed36526dedc6df4af74ef0e400c2ee2e19bb533cf2a4fa51df83f21ad78abb0e8e90bce3469e2e8db5f780ba8a900aedf2737c736945431b836ba0a76574b26 SHA512 7136d59383bf43c6a024a31aa29860a3e89893ff091a42f44f9e7088fb318920ab886cd1fdabc8ff6e3c30f8eb3d46d707228d2d45fb085ed7c822a4ffd89d13
-EBUILD tea-47.0.0.ebuild 1236 BLAKE2B f36a63925bc156474533cf22a7d188e3cd03bde1b925e46bdd1c9918af7b7d8432b4e5d1d7719996cc6816bdfa3d338742656822db871dec97c8e94474876965 SHA512 5211a5773ee3c878fbe0bd793d6f5a69759d24ceb0f78cf48b943989b238d90ad00d15fe14ba87044851a309674411d7d2574d7a53f1032a4117d6dca608f801
+EBUILD tea-47.0.0.ebuild 1243 BLAKE2B d3526f6247021d043cce9c7b96cade90f6abbe00b50f988fab2e40908f72e101825cc636749d06f5f583d4305e7a93d1dc22d243edaf99ca85e4caa7410dad67 SHA512 ce9fcddf4d71ada0ffac805f227817294bcb07f7a4db8cfa72df1be1546ab72c1803ddbf02f89f45eab6bc25d9b4f6f02a0b433cd5c756e67b9fc20bc249f644
 MISC metadata.xml 738 BLAKE2B efcd8b84093a75b8c7cb020c2cf7a85a37aa5f10e76269a4dd4306be05563306cd8b63486c008d5285a5599d39d60eaad0a146668aa346edddd057a87787cdd8 SHA512 e4bab7faa04cbf916c70b6a2b88a9efba1ee150e05e0f190eda833ebebd598212b584de656032805cb123108fcbc8e53887c6e5fd50f099420ebaf01a7baa51e
diff --git a/app-editors/tea/tea-47.0.0.ebuild b/app-editors/tea/tea-47.0.0.ebuild
index 312522fb992d..16f6139622f0 100644
--- a/app-editors/tea/tea-47.0.0.ebuild
+++ b/app-editors/tea/tea-47.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://tea.ourproject.org/dloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="aspell djvu hunspell pdf +qml"
 
 BDEPEND="
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index 39148525a0c3..8fefc649a28d 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -4,5 +4,5 @@ AUX ted-2.23-0003-avoid-compressing-man-page.patch 1116 BLAKE2B 861d52809598d0e9
 AUX ted-2.23-freetype261.patch 273 BLAKE2B 3a9b52da5de4b8d991298c438a5589b1c70e70b0733d561f0a0c259b7eb1cd39b418d6f472bfb24534b24f19bfe83623827c16a371dece16dd33171369006da7 SHA512 f8523865ad47a552d000ee14380c40ffe22cdd5287cb6fd6f79b7afe4a6ae4742aaa999c9c4d2d79e00b538f5b83106ebeb24f1aa25cabb656418759db9c0921
 AUX ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch 637 BLAKE2B bf905f5e5609b014256519587a7b640dfcf8fb0c45739a71df8fdbb3a269c834fa4aa96dc00bec79e63268e57faf9d5ded9568e72561e1f817cf7e630d1d1c1a SHA512 3e2c7ff378f9a537601cf3422c83deb32aa907bbaf80a6b87c68dee5b1fe44c90880230303b38eb9c6095ff5932d6e26fc764f8e69aac85241aadc4b44ee126b
 DIST ted-2.23.src.tar.gz 4672208 BLAKE2B ca5f0e0a6a1d00a50da6986455faedbb20cc1246737233c8a3a161b4f653c53b1647c7fb41c774082116ed3e4a0736f8dd35504a54a92dd8e6a6e9124e6e9850 SHA512 c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
-EBUILD ted-2.23-r1.ebuild 2081 BLAKE2B 3774e4ec51cdd60ef3f966847f68a20f298aceb49b0a14052ae0a2508048036ffc52d66d739e6381d7471718aea138b0446d98dfe9a4404b367999e431b1fc3a SHA512 7b1b2d322c7be9e1205748b00b3c94686129f75e2e9262e56cb0e8418722ede1465e4f4b5237d612f0945990a5baf2d9c9427546baf4a1d5e79074b73d86ddc3
+EBUILD ted-2.23-r1.ebuild 2088 BLAKE2B d0bf64100769295cdae75c29ef2f68909c3f2a39a4b967f80ef60a07e1c6b4c93313352abc391a058920d14e0eafe2711354f982fa6a8ab6209504cd3793a70d SHA512 a961e9aa74977c55de053e6933480995d76401985c98a9a16a12404b9d512dfc9191f9cc2ae5cd8dce4b90f9d8fae8bd63a90b888451045837498264dd8173f0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/ted/ted-2.23-r1.ebuild b/app-editors/ted/ted-2.23-r1.ebuild
index 6ad6952c107d..bf664679bfba 100644
--- a/app-editors/ted/ted-2.23-r1.ebuild
+++ b/app-editors/ted/ted-2.23-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/Ted-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 
 RDEPEND="
 	app-text/libpaper
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index f57b4eb61bc2..d3647ffe77c5 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -3,5 +3,5 @@ AUX texworks-0.6.5-cmake_lua_version.patch 219 BLAKE2B c09494099363fa26e4110c23b
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
 DIST texworks-0.6.6.tar.gz 12385550 BLAKE2B 241a9e4649e489964c62bd44ca310ffa7d67ebcb6187568dbf5e5b7916d81e3d846f0492a22e35d2c8a57d182d32d129600570e3836c671ae723c236f82d6bd8 SHA512 65300dfbe4e0e2f3b387c868e343f6caeff4602b47afee5a02cce82e0e23b74fe559b4b54fb65d778748de56f38581305a9b3a53d743c957b7dc14ecce4546d1
 EBUILD texworks-0.6.5-r100.ebuild 1697 BLAKE2B 221acad932dcb1242852069ff66f88eca9fa1b0e51bf592392a4de80b04c95db801c594854d4f7baa004a2e7d36f9ccd5cca4447595ec2297b56e0ddfb91f671 SHA512 1ac86be4dd2ee4d3509b323a0176a5cb9f1469bf5282a29be1b2a047a62073b217064e2af8ff0eaf1dfb674834206af160b0284c74cb29aca00315e217a798c9
-EBUILD texworks-0.6.6.ebuild 1663 BLAKE2B fc28490611f0bb5276469c6794fce6aa4b6a98e7fdcfc78c005074aeae0f06fec9e0263ae66a047b19359a2d407958a9b8db5575e31ddf39cf536875bb40eb3a SHA512 51a6ac818ceb577250a788d5f0049519fbd7a16c951bf8a0904bba9db3b06055d1f285862bc77588f87ce6ba910a08b50e539844d6aa150ceba7f2034c177d9b
+EBUILD texworks-0.6.6.ebuild 1670 BLAKE2B 47207b745b6e15bffbc18c33ee0043187a185ed59649b8851fefb96a2b11cf36b922283fd09c48bd5b11eb54717ac4a1f783646d7f5f8925557b33090606cfee SHA512 589674da802fa5c2679f463a6853515a992151b94ebb5cb8d3133df882208106afda2a43d35c041373e75c614346c5d7ef2b44160365e0c683e4d92f08a42a6d
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-editors/texworks/texworks-0.6.6.ebuild b/app-editors/texworks/texworks-0.6.6.ebuild
index e8ad1634456a..f7b5f65191f8 100644
--- a/app-editors/texworks/texworks-0.6.6.ebuild
+++ b/app-editors/texworks/texworks-0.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="lua python"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index ee4920c5b434..d471e33bb120 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -2,5 +2,5 @@ AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d930
 DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
 DIST uemacs-4.0.15_p20180719.tar.xz 151748 BLAKE2B 66572d3b4eb54310b7468a43fa718faa78aae8070a8675018f8dccc38d2dcb8e93b41942f49ca28b7c8ee5d100b541ecebfa2adc9a84f121a178ade0903029b1 SHA512 0baa273d5f8df75976d01acbe69b2bca7ec803c8a40364ebded39d16874426874af7b7547774c211fbbb96c82fcb69aaf75f8fa5fd3e95422ee105e6be7f9564
 EBUILD uemacs-pk-4.0.15_p20180117.ebuild 924 BLAKE2B c131409e4d2ab8e6d794497aff01cf61cb792ffcbc9ecded591ed0ec9019fddb9de0726b3318b8f2007e8b627ae71709385bbc32583c835c8c481dbedd1f87c9 SHA512 7157079b00308cef925a95e91a835fc13b105a723bfb7404669b12dd5bbd6b85bcaa7f1de844e06b513baa25f32e601093e489eda4987907c83e27e6b719ef9f
-EBUILD uemacs-pk-4.0.15_p20180719.ebuild 933 BLAKE2B 562f57c36831cf1b3c6d201651064dd753f28627ea987a8267ac9f981350c0837a5d34537c2289ebdab75745bb2a5119c49f34abab2220bca85a5babd6757330 SHA512 09eb12f2e1c6cf870a4cd179906e90f55783ce2db169bdc30c64a670f2519cfa413b5fb513b479c07260cdd5be08567e87cee5282fac627ac2e09013268f12a9
+EBUILD uemacs-pk-4.0.15_p20180719.ebuild 940 BLAKE2B 4f9b4ce7e1c09a4fe1fe4044645c71916d20123ff4e0274ef82286169ab23d46c69853c425a9471775daca88ecc078d65014b5f6b9f4d74cae2d63049fa1ddfe SHA512 ca6aed04023b60f5b6283f47ff9e3b5a2956deb11c2eb6619ee369b6f2256af8a16617bc0bb2d0fe49b0d7bfdc9435e875f88f1c0956ad890f2a83d22864b688
 MISC metadata.xml 1039 BLAKE2B b7661c49b2c3e2f3051f5f46e98e90ad9e2449e87882be00d735f45ed0568911c4bc04aa4b816389362b2db641c524a098476650eb663e07bd26e14137695826 SHA512 1287ac06c8db54c6a27c2981f14047bd95a82dbc45a80dac281a5d3aae3898809bc943d8a3c3d72d09b2a622f620c040e6d26028c078d921ef6b3fe572d9349c
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
index 0955ecca90cd..374c553c4437 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index 3ccd496d072b..2e165389872d 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,5 +1,5 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
 DIST vile-9.8u.tgz 2375989 BLAKE2B 86e2bb01fab7c429233484493aa33c0b807f7babedf6e69f4c526a6677471ff8e43287114073d22ebb229a801ef003779ab587c9a17474519148e1f64d58460e SHA512 fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d
-EBUILD vile-9.8t-r1.ebuild 941 BLAKE2B f7cfc4255b87f970d0f400802a68d75d8af4888dd40424d5007000f59c4ce3da969828867f40cb1fd1819803d09d632422587596b94f18f062e5f0f4e4887715 SHA512 ff42c353da28b1f6f7318e771b896f75786f284f6854acaf6207a523679507578ceffd99abd1f74dbb6ce88106c21099290145ddb098c03fcc095070ca6472b1
-EBUILD vile-9.8u-r1.ebuild 1059 BLAKE2B 02dfb4fb0f2e651ddd5e68380ae998adb2d3f2968f9e72444ad199b92be43ed8ff23a2ca524fa3203893477221544282aebe6873497eb1f533753bfceb1e48f4 SHA512 907ab99d754e091b15df9d1af70de1b19f0df7728906c617cd453a08c429fba2dfa6d53caccbb48b05007b3c5e0b74edd32e088d3ab03f24d18f96b392715e63
+EBUILD vile-9.8t-r1.ebuild 948 BLAKE2B 0c99c708ed8f5bfc397920e53fef20277f30b0633ccce14e2aec9eb50676a5c6aa587d5766427371fab4ed5d8da22294044b6ea18d7aa1c488104cdb18de0b0a SHA512 6dcfbdeaae7be136dcd46245ed67d8a3e3b14b1bc97174c7d51bc9d4b70a5d2a4f2ba23d62eac2decfaf78615762da92e3fcb77f65d6d780db19e73ac1fb045c
+EBUILD vile-9.8u-r1.ebuild 1066 BLAKE2B 474e0c34dddd521e0e8dc6a0c06d66e8897210b29b4e0951f516696911773bd9499c7adf43ae72555a447ccefafccd110c1e987bb5cbde74a5f39f503febad1b SHA512 567e9d07882b35e43887af3d7a9aeccae33d5811f8a2e8bcf52244f5bca8387a1c229e2f42d34bd40e4312a854f8fb4ab9c5c631b29c81598157f20a13b93a75
 MISC metadata.xml 347 BLAKE2B 5546714e3c87c1f8380e655e16cf7915878127cbf23ba125010a023056f73e20acb3a268aec33c1829244b7d637f62c47003d98ce90ac127035853b8f2c68ca5 SHA512 a0f8b7dd3327440537748c2e2faaf268efd46b20cbddfb9cbb1ced71b04ed37fd7b65ab3d317d1bc260fdad7497f60e32d29d9313764cdb0896f7137c39fa2e5
diff --git a/app-editors/vile/vile-9.8t-r1.ebuild b/app-editors/vile/vile-9.8t-r1.ebuild
index fa2cb4f2acc2..33ec3695241b 100644
--- a/app-editors/vile/vile-9.8t-r1.ebuild
+++ b/app-editors/vile/vile-9.8t-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/app-editors/vile/vile-9.8u-r1.ebuild b/app-editors/vile/vile-9.8u-r1.ebuild
index 480383dbd0b2..9766f07f55c8 100644
--- a/app-editors/vile/vile-9.8u-r1.ebuild
+++ b/app-editors/vile/vile-9.8u-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl iconv"
 
 RDEPEND="app-eselect/eselect-vi
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index f0e687998dc3..5551cb4b4512 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -4,7 +4,9 @@ AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e2
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
+DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
 EBUILD vim-core-8.2.0814.ebuild 6893 BLAKE2B dff4779f4d460315882b8bf65deec0af4cb1d1e52627bde1e707416dde0dd4d02d90fccd1ed733bf14b1c59ffa15ea1f15974bb2e75f63b936f447b89d1dcff9 SHA512 2d53b98af3206956a0bf224caaaf6b4ad233975fbd6b2e0fa5c53097132ab92d24109b671926436b32c109428dd1f2581d37e8bf942700c6e974b9a7039f7895
-EBUILD vim-core-8.2.3428.ebuild 6901 BLAKE2B 967b665e303eb59ea0bff03db8c38b5b6c9828c0c019303422191837ccff5bc1f8ec4ae737e2e8312169266f1bd70b8852c78e5e8ac79cca3e996bcc85f6701b SHA512 dffbb03dd8d94454a718bf280859100b87199fc3fa6b9d8d6758219e573bc8abefc8ad75897b78687dc1c4053d162de56c63da04d1c7cb7cd73b54fe9d60c51b
-EBUILD vim-core-9999.ebuild 6901 BLAKE2B 967b665e303eb59ea0bff03db8c38b5b6c9828c0c019303422191837ccff5bc1f8ec4ae737e2e8312169266f1bd70b8852c78e5e8ac79cca3e996bcc85f6701b SHA512 dffbb03dd8d94454a718bf280859100b87199fc3fa6b9d8d6758219e573bc8abefc8ad75897b78687dc1c4053d162de56c63da04d1c7cb7cd73b54fe9d60c51b
+EBUILD vim-core-8.2.3428.ebuild 6965 BLAKE2B 9291607bee0d73b10503555d0622691036dd70d94c4e32885436c8f5cfd507eb346bd82b19ae5be8d8cefd1e2379b98d19803359eaea691f957151ecad6191e7 SHA512 17bf8df13f8f97bace3487c1d1d009092e4ac284f8464c54afc2706489dd18d02994681d27388d5609ab01ca100225ef671cb292657b882cc70dbc841a3b845d
+EBUILD vim-core-8.2.3567.ebuild 6974 BLAKE2B 52c9746dd0acb3599109ac7cc30a71f808dd194ee0881c81ba9b52e7dec2ca1d40546a616e6713a4cad78da8b12f8446659bd6dea9b950e566bb69a7ad357223 SHA512 d62c507ba2d3f2c0c09e9b7f499c69eef38ad10d1997658c5065f76fd5e4f10d0aab54d2cc56cbc1bf7e7ce4b376e2530c37eed59a731141dcd27cd1ea1754c6
+EBUILD vim-core-9999.ebuild 6974 BLAKE2B 52c9746dd0acb3599109ac7cc30a71f808dd194ee0881c81ba9b52e7dec2ca1d40546a616e6713a4cad78da8b12f8446659bd6dea9b950e566bb69a7ad357223 SHA512 d62c507ba2d3f2c0c09e9b7f499c69eef38ad10d1997658c5065f76fd5e4f10d0aab54d2cc56cbc1bf7e7ce4b376e2530c37eed59a731141dcd27cd1ea1754c6
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild
index f141342833a8..e6a5693aed01 100644
--- a/app-editors/vim-core/vim-core-8.2.3428.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.3428.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+# Please bump with app-editors/vim and app-editors/gvim
+
 VIM_VERSION="8.2"
 inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
@@ -12,25 +15,24 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
+S="${WORKDIR}"/vim-${PV}
 
 DESCRIPTION="vim and gvim shared files"
 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
-SLOT="0"
 LICENSE="vim"
+SLOT="0"
 IUSE="nls acl minimal"
 
-DEPEND="sys-devel/autoconf"
-# avoid icon file collision bug #673880
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
 RDEPEND="!!<app-editors/gvim-8.1.0648"
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
-S=${WORKDIR}/vim-${PV}
-
 pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
+	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 
@@ -50,7 +52,7 @@ src_prepare() {
 		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
 		"${S}"/runtime/tools/mve.awk || die "sed failed"
 
-	# See #77841. We remove this file after the tarball extraction.
+	# See bug #77841. We remove this file after the tarball extraction.
 	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
 
 	# Read vimrc and gvimrc from /etc/vim
diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild
new file mode 100644
index 000000000000..7e80dc2f16f9
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.3567.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="8.2"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
+RDEPEND="!!<app-editors/gvim-8.1.0648"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See bug #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug #18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index f141342833a8..7e80dc2f16f9 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+# Please bump with app-editors/vim and app-editors/gvim
+
 VIM_VERSION="8.2"
 inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
@@ -14,23 +17,22 @@ else
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
+S="${WORKDIR}"/vim-${PV}
 
 DESCRIPTION="vim and gvim shared files"
 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
-SLOT="0"
 LICENSE="vim"
+SLOT="0"
 IUSE="nls acl minimal"
 
-DEPEND="sys-devel/autoconf"
-# avoid icon file collision bug #673880
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
 RDEPEND="!!<app-editors/gvim-8.1.0648"
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
-S=${WORKDIR}/vim-${PV}
-
 pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
+	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 
@@ -50,7 +52,7 @@ src_prepare() {
 		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
 		"${S}"/runtime/tools/mve.awk || die "sed failed"
 
-	# See #77841. We remove this file after the tarball extraction.
+	# See bug #77841. We remove this file after the tarball extraction.
 	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
 
 	# Read vimrc and gvimrc from /etc/vim
@@ -59,7 +61,7 @@ src_prepare() {
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
 	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
@@ -69,7 +71,7 @@ src_prepare() {
 
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
 	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
 
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
@@ -100,16 +102,16 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
 	filter-flags -funroll-all-loops
 
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
 	# everyone since previous flag filtering bugs have turned out to affect
 	# multiple archs...
 	replace-flags -O3 -O2
 
-	# Fix bug 18245: Prevent "make" from the following chain:
+	# Fix bug #18245: Prevent "make" from the following chain:
 	# (1) Notice configure.ac is newer than auto/configure
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
@@ -125,7 +127,7 @@ src_configure() {
 	# things are for ppc64, see bug 86433.
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
 		if [[ -e "${file}" ]]; then
-			addwrite $file
+			addwrite ${file}
 		fi
 	done
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 410a00840aec..3f8303867e3e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,7 +2,9 @@ AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
+DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
 EBUILD vim-8.2.0814-r100.ebuild 9303 BLAKE2B 90209968ee61a842a569d8fa8dcf58f77acc181b617aa638d92baca8b448897b8e76f377134a062b2501166361e8284cf08a31db1c730716fe8247c76b9b16e1 SHA512 604983d7893ac4fe47cc74c2182a82b60464fe2910775c889ea7c251f846fff77908c00c987c6bedb9acc55a6a26dc812fad7694b264c4c18e0e1f72eeccf815
-EBUILD vim-8.2.3428-r1.ebuild 9302 BLAKE2B 383a03fd372c7569c1e63ae8f8be2fcddbd93b91ceaebef35ecf17146b78a8a6825d9bd7069d6683d568d3135047a08061a5b1545beaed455f5817b64654948b SHA512 3726ffa921f14a3d65d65f61fb56ef95dff1c49b24844ca3ba13adcfb0ee722fa77818633128934abafb2647d96da3bf73b64367853e6d9879e682da74a826dd
-EBUILD vim-9999.ebuild 9302 BLAKE2B 383a03fd372c7569c1e63ae8f8be2fcddbd93b91ceaebef35ecf17146b78a8a6825d9bd7069d6683d568d3135047a08061a5b1545beaed455f5817b64654948b SHA512 3726ffa921f14a3d65d65f61fb56ef95dff1c49b24844ca3ba13adcfb0ee722fa77818633128934abafb2647d96da3bf73b64367853e6d9879e682da74a826dd
+EBUILD vim-8.2.3428-r1.ebuild 9942 BLAKE2B 7bb7a35f904a84533fc34768b825099637e7dc26fcead4643b0a0fa6850a9a6d97db6f5d992c5aaaee58ea18b427e709b343d18d1361f3448834722837ae1466 SHA512 9238439be1b15f51e07e9daa10ba93cd2eea0692d7fe7c6226548c64d3e48a3747f66740be7390dedb371000f37257b5813e87fba70cbf44d946161f99ebeb02
+EBUILD vim-8.2.3567.ebuild 10016 BLAKE2B 3539d6d9fa5c2f18c762339368b0852ee380c9c95225a48f2153ab1ed3303b58e43c24b6eb8ca1d9f2785f9d16bf91b026b99bb67f5e810b7bb9a3397e21f7b0 SHA512 0ecded0197309fb79b0ae85ca1d262a6876688b594e0443ca87af39ad92e0de3915fa689b130bf336110ddcabbf86296b82d196aa70382dbd5c0df901e807917
+EBUILD vim-9999.ebuild 10016 BLAKE2B 3539d6d9fa5c2f18c762339368b0852ee380c9c95225a48f2153ab1ed3303b58e43c24b6eb8ca1d9f2785f9d16bf91b026b99bb67f5e810b7bb9a3397e21f7b0 SHA512 0ecded0197309fb79b0ae85ca1d262a6876688b594e0443ca87af39ad92e0de3915fa689b130bf336110ddcabbf86296b82d196aa70382dbd5c0df901e807917
 MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild
index d15fa2f9dcc8..6324e9000f56 100644
--- a/app-editors/vim/vim-8.2.3428-r1.ebuild
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
@@ -270,6 +270,20 @@ src_test() {
 	# Don't let vim talk to X
 	unset DISPLAY
 
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\)'
+
 	emake -j1 -C src/testdir nongui
 }
 
diff --git a/app-editors/vim/vim-8.2.3567.ebuild b/app-editors/vim/vim-8.2.3567.ebuild
new file mode 100644
index 000000000000..e95a8438fc8b
--- /dev/null
+++ b/app-editors/vim/vim-8.2.3567.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? ( ${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	!minimal? ( ~app-editors/vim-core-${PV} )
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable crypt libsodium)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command "${PYTHON}")
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		if use lua; then
+			myconf+=(
+				--enable-luainterp
+				$(use_with lua_single_target_luajit luajit)
+				--with-lua-prefix="${EPREFIX}/usr"
+			)
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\)'
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index d15fa2f9dcc8..e95a8438fc8b 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
 VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{7..10} )
@@ -22,8 +25,8 @@ fi
 DESCRIPTION="Vim, an improved vi-style text editor"
 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
-SLOT="0"
 LICENSE="vim"
+SLOT="0"
 IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -53,17 +56,16 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
 	sys-devel/autoconf
+	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
 
 pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
+	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 
@@ -94,7 +96,7 @@ src_prepare() {
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
 	sed -i -e \
 		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
@@ -105,7 +107,7 @@ src_prepare() {
 
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
 	sed -i -e \
 		's/ libc\.h / /' \
 		"${S}"/src/configure.ac || die 'sed failed'
@@ -150,8 +152,8 @@ src_prepare() {
 src_configure() {
 	local myconf=()
 
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
 	filter-flags -funroll-all-loops
 
 	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
@@ -168,11 +170,11 @@ src_configure() {
 	rm src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf
 
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
 		if [[ -e "${file}" ]]; then
-			addwrite $file
+			addwrite ${file}
 		fi
 	done
 
@@ -270,11 +272,25 @@ src_test() {
 	# Don't let vim talk to X
 	unset DISPLAY
 
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\)'
+
 	emake -j1 -C src/testdir nongui
 }
 
 # Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
+# to respect user's choice (bug #187449)
 eselect_vi_update() {
 	einfo "Calling eselect vi update..."
 	eselect vi update --if-unset
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 3644040be15c..44cd958c2666 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348a
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.7.ebuild 2082 BLAKE2B 04130f5c29e2f30eebd308a6656e37444c876c2c4c64680c1ed743ff4dd399bdcfd908f5819708e22c30ee6b8cbe82808e9a3b2b08ae21d8d77d3fb4fddb35cc SHA512 59de24a57fbf4f99330a9fd1c927f3bdf4205eb580d4340060241d6b58d7edea45eeff63574574e6ef62dad92cde5fa82e6c8976ca1f1041ceda2b3b45f5a449
+EBUILD vis-0.7.ebuild 2089 BLAKE2B 6f162ce08ee3df3ccc361c72e95dfd0736629a8970cccef34f389896cd40cf3a34c13f05704603609f53d062c9ec26a25323fa467dce631cdee4475a8bcee76c SHA512 4b7810d5ec4780f639fc52372a2d031ab791abcc06f88887fd69eb883f0a5d82b394501625f0393b06a5235ebeca4346b4795798ea2d733a15426f7506ec8a83
 EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f
 MISC metadata.xml 624 BLAKE2B 5a95ae9ee2534eaccfccfc71f92ba0b978fe6794a42eeb6015812443c0b9ad30bfc604e183c8707e0b6594ef14df6ab499553e0495503768c5807327aa1f09ea SHA512 e052254e86f089107f9bc0b0cc6fa326aa10209d02a7ac1eeeeab040a0d197da3429a6a289ec8c92de64fdd4452f3752d73905c409b1970767ec4ca00c132a69
diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.7.ebuild
index ae3e241b5b45..775cdeed1fce 100644
--- a/app-editors/vis/vis-0.7.ebuild
+++ b/app-editors/vis/vis-0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
 	test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )"
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="+ncurses +lua selinux test tre"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest
index 5b5f264627a2..82294d6a2c73 100644
--- a/app-editors/wily/Manifest
+++ b/app-editors/wily/Manifest
@@ -1,3 +1,3 @@
 DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b
-EBUILD wily-1.0-r2.ebuild 719 BLAKE2B 97fb754aa6dedd896a7bceee57ff3703aa8e590004407ce2a5a627a249e47b3c3b6c6af7dbc5fcdac635c466c9fc1d65c7ee29d01f29ccef285fa15ca1e74320 SHA512 b24d2e7e8ab0cb3a1143b194e05948d2ec0027d00c661323d95e069e9f606d2a577ea8dd7805f60e87c65747c9e59985b96e7ad7c1ac251fb931fdaad39d2a60
+EBUILD wily-1.0-r2.ebuild 726 BLAKE2B 73a8184fc9095bf9a75c1ed75777b82bb179cb5b766054ae5d019c8596925be7f825b73b7f2eea78e233a23e1f936b62f20a05f974a92d18e59036ad722b3299 SHA512 bc63242c481eb93d79b0ac9c19349cc4ad16646b964da55f349438f65054479377a3600f5b084ca6b151ec6736eb164d5f581ac4abb76b1f93eaaf5df9e1e0bb
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild
index eafceb60d927..6ab975827e2e 100644
--- a/app-editors/wily/wily-1.0-r2.ebuild
+++ b/app-editors/wily/wily-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.netlib.org/research/9libs/${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	dev-libs/9libs
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 414cafb3df21..1e8d1fbd28f4 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,5 +1,5 @@
 AUX wxhexeditor-0.24-desktop.patch 613 BLAKE2B c923a7f2782f5f88321d1f86ab75c7a4b05d167d86ece484a01b4e26fa76ad8484d19e5dbe337766ff3de6f8537263d17d810b3a5d9d62b883d5eb07238d0155 SHA512 f542918c3f42546b21bce165853f54ca166d0d8335f948c5d442eb7710d4a1f403d5dc4260b238ce6cfd692d37bad101a4fc6bc83742712ed247bf5477662685
 AUX wxhexeditor-0.24-syslibs.patch 2458 BLAKE2B 65dc8a710fb33826b5ae9a9ae2b31cdf58e58252aa4be8df37a4e18495faaaee066c95f1b527d91c71b9b38d8123cc1cac91e9e0386a67ed77b0b8e24ad43016 SHA512 658526b38bb3e3313174ac464711ccceb3606e38e6826c62b4dcb5dca79c6ef32c6d7c84e883035572431eebaf0b7e2ace154df406f2338f39aace84d9fe9403
 DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
-EBUILD wxhexeditor-0.24-r1.ebuild 817 BLAKE2B 360b1722abacffc995737fdced35c4e9b5ae6f52aa92a160bc8e8e18822b3cec74bd2c1386b7d7323bd21a2f1ff8d01123275eb8bb4bb443eb0b5c86eb926154 SHA512 123a8a5c0a52059a5b90efd34d094818f81c01c20007878c5f6c5fadd146b061de2fe6068b6055c504a1f5b0911f292645cb47ac65643881cd0b41ec4e902b75
+EBUILD wxhexeditor-0.24-r1.ebuild 824 BLAKE2B 9c3fd7569664e797054f5e1bbb10ced4d0f76dd78047ff6f984e0ebe9b4d9201e8cd7f61c66956eb0a8aeac8b44676d42e2b3a14a1a3a506b9c1cb71cca58aba SHA512 61b4c5d96d1dab44dd812f90946f088323775c132680de7ea01be68e96e0aa19eb07229e5dcaf2f6d1c4c63c6fac441b4c81abe0ec62d2e6a5efecd8e89e9f27
 MISC metadata.xml 353 BLAKE2B 040e64204cc4bf89890f4c62b68edeb61d2416e4fc6e5b3bfe42117593fbfec4cea562b4f1a957630a927d3b6af82e013fa33096f3c490492c3627fd41adad40 SHA512 8ad5b1b6b9de27379ed3cfbd6d23e18bc11ad58dea8f2cdd31303c5e8b455be96fce21b797ca4c23e103ffc7017663e306cb56e40cdd635ad1977bdddbaf84dd
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
index a31c4b0aa439..e1458645feaf 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index 78eb01dad4dd..1db4f957c273 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -1,3 +1,3 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD xvile-9.8t-r1.ebuild 882 BLAKE2B ac6b03eb74aca0397660a7e5a9dbab0328b1caf114a470b745ee198decacb259b24849495e82dc5f3669f09848f7ba430daf16fc11e67ae2807f315debf53e57 SHA512 1dad314acddd4ca6ab988225d905f668ff22e43a8ae1aa640b3d42d1eab30070dae53e962c4cbebc342971c68f0b6ffc707175c5414cad4da6e51fd6ffeb0fd9
+EBUILD xvile-9.8t-r1.ebuild 889 BLAKE2B 94cb5120f3470a33e4b15430f8b17bd59324669df9b3f57551cc2aa99a7c6b26a70fa4e302e4dc6eb1c306f9595e947273fe1cb9c33c10c6648b9aa48e23b00f SHA512 3960242eb7b1c87438d3ac788f17dacc64d683352d780933436b28dd6a3306646e9edbdaff430e34c3ed4d10c96234ea4338a1c713ebc6e38a529fd05a56ca8d
 MISC metadata.xml 347 BLAKE2B 5546714e3c87c1f8380e655e16cf7915878127cbf23ba125010a023056f73e20acb3a268aec33c1829244b7d637f62c47003d98ce90ac127035853b8f2c68ca5 SHA512 a0f8b7dd3327440537748c2e2faaf268efd46b20cbddfb9cbb1ced71b04ed37fd7b65ab3d317d1bc260fdad7497f60e32d29d9313764cdb0896f7137c39fa2e5
diff --git a/app-editors/xvile/xvile-9.8t-r1.ebuild b/app-editors/xvile/xvile-9.8t-r1.ebuild
index f36ba9af2292..e665c73095c6 100644
--- a/app-editors/xvile/xvile-9.8t-r1.ebuild
+++ b/app-editors/xvile/xvile-9.8t-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86"
 IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )
author	V3n3RiX <venerix@koprulu.sector>	2021-10-30 19:43:03 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-30 19:43:03 +0100
commit	162945d2a91899b637bbb9e163b406350de12906 (patch)
tree	49cc2cc66f724a7c6f033f93aaba4ae3be1f2259 /app-editors
parent	f660c6de84558324d784218831d8f0782ee41e2e (diff)