gentoo resync : 16.09.2020

36 files changed, 29 insertions, 318 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index bb3fd0f88d18..1885963ef634 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 18ce3059501e..44da6942f94d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -13,7 +13,7 @@ EBUILD emacs-23.4-r19.ebuild 10987 BLAKE2B 9837cedc2675773c59e583f40f4d3bbcdeac6
 EBUILD emacs-24.5-r8.ebuild 10839 BLAKE2B 71f333423f8399ff9a4eb343d5c521c24f43705c84819d671396c90d94f691a13047afba7880e09d71a586110f1a2a911327c4d6b3fa3ae9e98ba924c2cbfc29 SHA512 dc1f984e87cc347dcc8708ba4c52d1b66e031ac19c0e203df28e940e64ac02aaca56c978d1cfbf553d7ddf3847a67c8ee54888f4beb1d0cdd7534035ce264c90
 EBUILD emacs-25.3-r7.ebuild 11181 BLAKE2B 1db9d77454b1390a8747b5cf63941554ec2e88430b13d36e95c2ba050356fdcc0084fec2c7b0b1320e206d901626e736c23e83911dd0ffe93d85d4370179fb1e SHA512 dda6dbfa227997eafa93d363779162b074766a9313774cd4aa4006e605ad9967f86f61b27d0b817d01afce9cc3148c40f63cb47dae9f1267122512cdc37454d1
 EBUILD emacs-26.3-r2.ebuild 11968 BLAKE2B 60a9d7c23bf25d6c1a8d6b8d65c3689891a86756d2b0ae2dbad1ff3671afdb7b2dff60eb0e2863bd834480910f41e9a3f04bd20368158686a64ca3281623defd SHA512 ca3729faa843ee6e7f0ca7140c9cc8425b1a62e98a2fdd2cb6ced64afbec0bf5e84fd0e1a8dc990de0f85cb53ad3ed4efb8faed059246f5aa7b3539083851763
-EBUILD emacs-27.1-r1.ebuild 13520 BLAKE2B 38f906039421dd516b2aaabbdd564ade2751ed09dc0b8e973cf78a52b8ba72e65bb88f3b57c9f8a913f6ee0e95cd6ddc567e4aab1de8cdf69b113b11607b79fa SHA512 5131994b3ee6032266232e8af49e15a4f9c1ab9e26a85a3c34c181583730694d0a20a6b099a734dca15308bfdcbdec18e9c33c4c654f7eb31ea78203b5670194
+EBUILD emacs-27.1-r1.ebuild 13514 BLAKE2B 1d935db0db11ba000b800243955a7a4c688f8bb6be18031dff39b08133c4e4d72ac7af53bde7192ad4f29e58cee2167e804d806df26b213f30ec629bbf3a24a0 SHA512 1342bf31511a7097b9d9157a1dbf419d2863d58f1d18e958a92b95ff20cf942dc1bd985260db93f56735b5df264d22f69e8a607a254d5042bc7a1dd57c3890d6
 EBUILD emacs-27.1.9999-r1.ebuild 13477 BLAKE2B 0331ea699d68acfff608efcc88f367e30633c0b115a04ed24328325786fb06730d7b063996a2b85ab01a74f8d790edbd706a8d6dc49e4f6ccab6c4d793e5c0b2 SHA512 e26cf52c1e67c57a9f9dec311a45e0ff6d8531e75774e55790bdeac257b9e03f189eeaa5ba82e09856e2ad892f0e4355e3f5010ee29812ec5ac99e6c3839de37
 EBUILD emacs-28.0.9999.ebuild 13448 BLAKE2B db0e9b950299594bd63f8a5b755bb52f8dfc47cbb10cca4ad71638d80e06bbbbb88e42bc5ec5c04ba96e86d56c2165a9ce153768dfe7be42462a5e67f50d837e SHA512 3cf9cdcb2b176472a0402d365119f674637a1218b35adab9edc14d67ce9e57d674a9932831b47e4367ff14f7f3efa74165b7350f0ca8a8971910a090aebf516d
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-27.1-r1.ebuild b/app-editors/emacs/emacs-27.1-r1.ebuild
index b2548c76e2c3..ca452d218653 100644
--- a/app-editors/emacs/emacs-27.1-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1-r1.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index dc821061b642..bbe68da8ca13 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -2,4 +2,4 @@ AUX fte 604 BLAKE2B ccb21ce020421a68d33fb94185d3acc6ad26f6f8cd0c574c9ca611aa9231
 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 2660 BLAKE2B 7dd117e3960a50a303c1bef1a7132873d867f351bb6e7e6f06a0f74e0adfdac40da743c46283746b0296281194edda685a338658c2d2142a4d066c5ea95a8532 SHA512 9758298e84d5bc0173d744eca0b6843188519b25a32bb9697bbeb6111217791b3e6076fec8cc67f6ee71760dae6001262f968a5679bfa35df3cd872fb6f8d946
-MISC metadata.xml 312 BLAKE2B 0092b7eaef6d8c1e8f1bd490c8d4e9f43909d86097fbf06692b2e92e7496332bac289bb40fc3cb9a7dc1d32a63ca19db01cc75e0a9014f1d2e8074816ed26a8b SHA512 3946924797105501c1388f172caf774488ebb480ff13664fffd75fb30ebdfba27d52c3e7d534e7dcad5204b6074ba28ee25a4724ed117748059fceeff9d23b60
+MISC metadata.xml 245 BLAKE2B ea33508ff29b4f24aab82fc591b95af9c809371cefb4753183be47cf8889e92312e0b84d27a78a666dd71dbd7ed681858333c8d69e916863bd06ba7b18230a74 SHA512 9b27222b0c0d858269d3ddd5449818170293bfad93ae5ed4687ad6aca27a73136efcdeb6bb99f604ab75d1ad436b7244556ab94bd0a4afcb4967e97db9b74e4f
diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml
index c209ef776339..182929f87cc3 100644
--- a/app-editors/fte/metadata.xml
+++ b/app-editors/fte/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>Lightweight text-mode editor.</longdescription>
   <upstream>
     <remote-id type="sourceforge">fte</remote-id>
   </upstream>
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 79e66a44c99f..6fa022026f6e 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -2,4 +2,4 @@ DIST gedit-plugins-3.34.1.tar.xz 978800 BLAKE2B 03225ddc414e172f08179c64fbf12d02
 DIST gedit-plugins-3.36.2.tar.xz 980648 BLAKE2B 37f55b742258b233d161ce808483ba10f158b951f06eaee53d966edc275dad67a2d11eae342fed7bc9b185d1309c5795f645eabf24db99a6e6551a3dae19ddb6 SHA512 d46a5ec69f69838144333ca3e66abc7c64cdb3248877b38298f869027dd3bab16102957e723ad1b0d3c6af55745c2b7ce321949acb2575734c649a388bb0100b
 EBUILD gedit-plugins-3.34.1.ebuild 2750 BLAKE2B 31b530c4ab8fa64b5f7c847a514667e60f150533aa7b7ee3d74f157beead02fc11d984fcc8132ca95150cefe68c155524bd336afc2f1850019aa277ecfdbc6e2 SHA512 8af5c9214f9f020af53b87289f56dac82934db2c59623466a1e220d262596c441fdf859c3b4107f9c821665e6d3b177e1d98f54fffa88b34a7b2866130111243
 EBUILD gedit-plugins-3.36.2.ebuild 2723 BLAKE2B 08e057033afbb73771137966c7d343afa223ff0ae028dedefebc0e049cab781fc476c95fa139bf086df322b6229e0111cddadc7b13ca4fd00eb8ab3caf45f3d8 SHA512 242a3f7f43a1f42307bbd455045e5e394ba5ea9ac8b751fb901bd0bc4a5e01c7ced2d0f92b5c98eba394a4d1225c600e1c995b89af15c7ffe260fbe0fce718f4
-MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
+MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index 0b4585984564..40b4aba4be42 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -5,7 +5,6 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<longdescription>Official plugins for gedit</longdescription>
 <use>
 	<flag name="charmap">Insert special characters just by clicking on
 		them</flag>
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 608d5d96583b..0271fc075a1b 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -5,5 +5,5 @@ AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac33
 DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
 DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
 EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3
-EBUILD gedit-3.36.2.ebuild 2442 BLAKE2B 8dd89315440e2faa513e8e8a903e76e3175119b9cfff7c961603f833f0e96d75a68155bbeeccd37b8d3a04eca88378f7c78527389e91b09f6dc20d3f7dcd3693 SHA512 6d94f34dc95cd0f90a3e190fe68de22bbf30089e67a5c5685c06f8e9c028d3349bfcc86ccceffa6a51878c71c528dc62929df32280ff851d63d2373ee2dbd6fb
+EBUILD gedit-3.36.2.ebuild 2447 BLAKE2B 438318fb6c67658fbebc9d88175fe33b02265abb4eeecdd2ae4dd041332ea0f2322f2a8ec066498c8f5ae444da31d752710c5ceb3bd4178558b3602a862f8b4d SHA512 751f6ceb54780fd924219fdcd41514af0cde321928f5c0d3d322a30d3e29dc7464ff9a0ba9716f98fbb3f7213fee6c162a14d475d03d31f8c7eaf950d5352b7a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-3.36.2.ebuild
index 2c8c19b5587c..41d504dc337b 100644
--- a/app-editors/gedit/gedit-3.36.2.ebuild
+++ b/app-editors/gedit/gedit-3.36.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # X libs are not needed for OSX (aqua)
 DEPEND="
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index f3d9d9503201..c45b7d9f3bf1 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -6,4 +6,4 @@ DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174
 DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
 EBUILD hexcurse-1.55.ebuild 667 BLAKE2B 3e6fbad3a1f63fee93d6b0e95f3fca1b169f4f47ec4a24ce8ccefbad01a1f88a159ff3b8b412a77fe19761fbca3a92649382e6dba3adacf94b200f4cc22a8814 SHA512 46c9e32f704a557cc6d8445b711aa22da954201a894ee8d71f7d6aace738a41c1939df969595043ca62a75375c8fc2fcb3172c7b284f42a6906aa5f07ed780dc
 EBUILD hexcurse-1.60.0.ebuild 706 BLAKE2B dc3b15be8fd7f967c25624ff29ea7ddd29e6dd787d427d6ac3ea0cebb73e1d89db13c05d91170f12af24dcd755de295f02942b852f340f8c40788b3f1bc1feb8 SHA512 6c69ea5924d248d9c4bcaf6a801377ee070bc759702568cf98ffcb4b03dd907f6b9a633cf7cd380d5a69f2fb823068d3efcc002b5e1c624feddb678b39dc4e22
-MISC metadata.xml 463 BLAKE2B 104010d8e61f58282a944b121dd649fbceca67fe8981030d7aae737bf709029a94c75bfbd648c07bfbffedfee10cc0cb5718da7376eee7b4b5ce014a987acb6c SHA512 571a214805d30efc4f0f8a83964938e175aa1cecdbf76c1153189315dca316b625507860ac86b14209ff116706e8beedbea7b66aa5714ffde264ca94a88270c1
+MISC metadata.xml 341 BLAKE2B f4e87e5d95358a8f4078d0e6940f7d6b3f7f68f6ba7b5ecd4b2d28b3a55528e0ab70787c5768b9b6fe27e293a3225c87a147d163eab3d3798d4f6e14d2c54f67 SHA512 9dae98987744bc9a84ac94d729dbd6e1147abc81bde05cfc784ce039b34c75f6c22d1da88b25cee28594ffb5286a65cf38331c30b45af2bba5dec61580260ec6
diff --git a/app-editors/hexcurse/metadata.xml b/app-editors/hexcurse/metadata.xml
index 05c3859ddbaf..c58eb6d6c4f1 100644
--- a/app-editors/hexcurse/metadata.xml
+++ b/app-editors/hexcurse/metadata.xml
@@ -5,9 +5,6 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<longdescription>
-		A console-based hex editor for the *NIX platform which uses the ncurses library.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">LonnyGomes/hexcurse</remote-id>
 	</upstream>
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 865c2db9964d..6c3a38603392 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1,11 +1,5 @@
-AUX hteditor-2.1.0-AR.patch 362 BLAKE2B 7698e475679e730f4e5642f1acfc802170810699209c6e68d6587075bf95502eaec18e618b065b4072178e9d4371628331af1d867495c7283380facc07594a24 SHA512 3b656378c025e94fa480b942ae9ce073b9af33a062ba9806d3baeb2b091df1a186eee87e58e1ddcb9823c97db4a68f0f69ee0584aa0b4bfb03f487bc28dcf7c4
-AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f
-AUX hteditor-2.1.0-gcc-10.patch 989 BLAKE2B f4678cfa1eccc741005d4a51d4c74f4d01c0f62594b1f138121758db26b24c4a588430a43f4cae5d9b6f4032236c4f6478b385542e060c37225859d9cd78ba93 SHA512 2fceb761e1ef4225917a66db2fabac1a38072e83ce0fdfa9bdc592d34f9f7870c2a0aae971a4ebe7baffb52203f6b7b906e57f672925fbaf0c8ca77fcebf1a2d
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
-AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
-DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621
-EBUILD hteditor-2.1.0-r1.ebuild 1340 BLAKE2B 3869802dc5c5a8d19a3e8ccefb1ff4c14ff6a27775e95bda7a2d29c7e394af9b37a6b4ca1a9fe73c14d4163e7d9506719e4378440797a5d3d2fa3ee71e83ed40 SHA512 0302c17994d1fa7f7b22995912bca82942c00141db3a79d1c67b41aff74b6c92e6b8920b20e63917926fa775035ee4db3b38ffd6ddf09314a439f5826afa3bd4
-EBUILD hteditor-2.1.1_pre20161206.ebuild 1065 BLAKE2B 76c002feeb153448c4f34ea7bee41a767861c5f760ee5e71e72c7b144afe458fd467d68d70d7041167f349ceeb08711778809cf212ad5e1d157d5e33bbd3c8b0 SHA512 e6874b42a40c6a6e61870326e9b0bcaf51a600250da2c257449503b924802f46403a3be9c62aaf67b18b0fc579b2e9d615ff98eec2489477cd868f138973d0ec
+EBUILD hteditor-2.1.1_pre20161206.ebuild 1064 BLAKE2B 4d4b1c02c3d0a0484dc0e12d32303f8977af7ac972b4b5df3147594c0a9cba6434f6745bb00eb7fe40e34de7d0c72f8d836c02902f857306c9af198dea5d53b3 SHA512 c36e1528a6e79f222ada5c97a8c0f49e4e338b597369ca768312efeaf33cb919d96fac1f7bf5477ccb0b4f25c29e0aff8f7f78817f8cc99496e77a7fd6bc2528
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
deleted file mode 100644
index 60a0427a2125..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/722040
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,8 +104,8 @@ AC_PROG_CPP
- AC_PROG_CXX
- AC_PROG_YACC
- AM_PROG_LEX
--AC_PATH_PROG(AR, ar)
--AC_PATH_PROG(AR, gar)
-+AC_CHECK_TOOL(AR, ar)
-+AC_CHECK_TOOL(AR, gar)
- 
- if test "x$AR" = "x"; then
- 	   AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***])
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
deleted file mode 100644
index 408d1b9b1be3..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/521018
-
-From 5839355d67ff822593190473a41512ca19e4280a Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladk@debian.org>
-Date: Wed, 18 Feb 2015 21:20:39 +0100
-Subject: [PATCH] Fix "format not a string" compilation failure
-
-Compilation with the flag -Werror=format-security fails with
-the message:
-
-error: format not a string literal and no format arguments
-
-This patch solves the issue.
----
- asm/x86dis.cc | 6 +++---
- htpal.cc      | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/asm/x86dis.cc b/asm/x86dis.cc
-index 0830d9c..bb9028f 100644
---- a/asm/x86dis.cc
-+++ b/asm/x86dis.cc
-@@ -1218,15 +1218,15 @@ void x86dis::str_op(char *opstr, int *opstrlen, x86dis_insn *insn, x86_insn_op *
- 		default: {assert(0);}
- 		}
- 		if (!insn->rexprefix) {
--			sprintf(opstr, x86_regs[j][op->reg]);
-+			sprintf(opstr, "%s", x86_regs[j][op->reg]);
- 		} else {
--			sprintf(opstr, x86_64regs[j][op->reg]);
-+			sprintf(opstr, "%s", x86_64regs[j][op->reg]);
- 		}
- 		break;
- 	}
- 	case X86_OPTYPE_SEG:
- 		if (x86_segs[op->seg]) {
--			sprintf(opstr, x86_segs[op->seg]);
-+			sprintf(opstr, "%s", x86_segs[op->seg]);
- 		}
- 		break;
- 	case X86_OPTYPE_CRX:
-diff --git a/htpal.cc b/htpal.cc
-index 03dea18..3d5f51e 100644
---- a/htpal.cc
-+++ b/htpal.cc
-@@ -307,7 +307,7 @@ void palette_entry::strvalue(char *buf32bytes)
- 		text = "normal";
- 	}
- 	p = tag_make_color(p, 32, VCP(fg, bg));
--	p += sprintf(p, text);
-+	p += sprintf(p, "%s", text);
- 	p = tag_make_default_color(p, 32);
- 	*p = 0;
- }
--- 
-2.16.2
-
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch
deleted file mode 100644
index 3516efd2871b..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Backport a subset of upstream c++11 fixes.
---- a/htmacho.cc
-+++ b/htmacho.cc
-@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, format_viewer_if **ifs, ht_format_group
- 				break;
- 			case MACHO_CPU_TYPE_I386:
- 				switch (c->flavor) {
--				case -1:
-+				default:
- 					createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess);
- 					break;
- 				}
---- a/htmachohd.cc
-+++ b/htmachohd.cc
-@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bounds *b, File *file, ht_format_group *group
- 				switch (macho_shared->header.cputype) {
- 				case MACHO_CPU_TYPE_I386:
- 					switch (c->flavor) {
--					case -1:
-+					default:
- 						m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian);
- 						break;
- 					}
---- a/io/types.h
-+++ b/io/types.h
-@@ -87,8 +87,8 @@ union htmsg_param {
- };
- 
- struct htmsg {
--	int msg;
--	int type;
-+	unsigned int msg;
-+	unsigned int type;
- 	htmsg_param data1;
- 	htmsg_param data2;
- };
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
deleted file mode 100644
index ebcc3c0aa43e..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=620732
-
-Fixes build failure on gcc-7:
-
-  htapp.cc: In function 'uint isqr(uint)':
-  htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous
-    while (abs(a - b) > 1) {
-                    ^
-
-Picked upstream patch that fixes it:
-
-commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6
-Author: Sebastian Biallas <sb@biallas.net>
-Date:   Sun Nov 13 15:25:26 2016 +0100
-
-    use unsigned variables
-
-diff --git a/htapp.cc b/htapp.cc
-index 53d8725..03236e2 100644
---- a/htapp.cc
-+++ b/htapp.cc
-@@ -3021,8 +3021,8 @@ void do_modal_resize()
- 
- static uint isqr(uint u)
- {
--	uint a = 2;
--	uint b = u/a;
-+	int a = 2;
-+	int b = u/a;
- 	while (abs(a - b) > 1) {
- 		a = (a+b)/2;
- 		b = u/a;
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
deleted file mode 100644
index 1660e108bde7..000000000000
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${P/editor}
-
-DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
-HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
-SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	>=dev-libs/lzo-2"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-gcc-6-uchar.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-	"${FILESDIR}"/${P}-AR.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Many literals are concatenated with macro definitions.
-	# Instead of patching them all let's pick old c++ standard
-	# and port to c++11 upstream.
-	# https://bugs.gentoo.org/729252
-	append-cxxflags -std=c++98
-}
-
-src_configure() {
-	econf \
-		$(use_enable X x11-textmode) \
-		--enable-maintainermode
-}
-
-src_install() {
-	#For prefix
-	chmod u+x "${S}/install-sh"
-
-	local HTML_DOCS="doc/*.html"
-	doinfo doc/*.info
-
-	default
-}
diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
index 03d8d87c000b..9b87e74ff978 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/~slyfox/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 94814e9d7b8f..d3c3c2d1d381 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,5 +1,5 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
-EBUILD neovim-0.4.3.ebuild 1844 BLAKE2B c1e1b79f035640c5a29c875494069810d7c6397fd9e76d13e66b5d4c25623fe065afbc39402c534e623a5739e7e49b8405ac57568b0790eff0bee015022f0461 SHA512 65a4b5df7e9d47030ff58fb4a915a77c39f161c74c139ac1ee21c4e886c38f17c42462352b36210b66c931e59e4841ba8863726446fb51d065ba57e7c4e6cc6b
-EBUILD neovim-9999.ebuild 1861 BLAKE2B 7eb5a5509a102b044cb69b056965b31a92e92aa04adb4b506102f19a7175fe654f498ddc1904805e99c0abc161aeda6c3a420dd5fe4576c95db1723c393fe24d SHA512 c6d6f456c6ee4ac41970e635e90d95eb32866f2a463b729f2624dadca7b727ced783e0081af0140c5b9fcf6e6b510adfb70551bae639f0831e35894730568ff1
+EBUILD neovim-0.4.3.ebuild 1848 BLAKE2B 5d34e6c00564c40ebbf638d94e4cecc79ec7f5d715b8e1509fbecc6b93abd3dfd9dd3b84f76b18cee7ecd61c45e0ac4a43b1bc3121b6ddf67770c63aaeb2f8c6 SHA512 fa4c6705036b50d096fb61ad685c5fe5fd8d6f74ff56887f1bfc94bebc5015fff4736232770ee973723b7f49434635335d3b1ca0839d0309f0ead800b4866c9f
+EBUILD neovim-9999.ebuild 1865 BLAKE2B 7a179dcb2aada0a8e059c4db391b15c3b23ef177506bfcb7d8ec42524100a33087e79895d6ff9eef2fba9e28df32245eb4b5309b2a753db89ecea21cae796b9a SHA512 8e782617caa8d3ee930eb2580e14317c30121967a83ade08b102a2be809dffdc016513a3fc0421d7c5759c2341e95b5be594cd1fb2edf9701ae9a38dd2c40d9c
 MISC metadata.xml 469 BLAKE2B d0ddf9873870f4578e59c5473cb4cbd1a1aa105d704dabe52f29ff4db51eb988174a3d258b9575a876669716de46f217fb23978a9c4bbe1adfd8a84d4e082399 SHA512 11ee9fc96bcbc2cf131737a4f274d4dae5620d8ff9a27cf9fc6765b7dada8750e220e79ac305161313496c3d1cd499c34d28aaa5f63d6b4776cb8aa4f8af8c1a
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index 4b797548ec12..34583324d168 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake eutils xdg
+inherit cmake optfeature xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 3855e2b02929..6944c0791a40 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake eutils xdg
+inherit cmake optfeature xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index de503beec17f..1a379eb1601b 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,3 @@
-DIST okteta-0.26.3.tar.xz 947272 BLAKE2B c4502315a3713aebfb6f19adb92b01268346b0f71f1f59007b7f0dc06aa1ad71993a7b022669f7912ad10cec6c7d2eed9b552d66294f6b6657e664c3b1ba95bd SHA512 345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6
 DIST okteta-0.26.4.tar.xz 969572 BLAKE2B 37f3a0c83c3a922030816813de9a66edff0f4a1ae9f3450f9fe195b52d1b053c23f37c8fb2a06b08ef8df47061123536f202809b3d4954d824103dfb1b912559 SHA512 2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7
-EBUILD okteta-0.26.3.ebuild 1771 BLAKE2B 32a6c29bc2f3bdb8cbd607c78c6f74007ec5997d6819ac2b4e6ba687440f501e6985c554dc8d3409783cb96b83d8ee1120fa42f7e0e43f1e2d0ef40baae28fe0 SHA512 e9f070af1cfc2969620dfc79232308b9cd0b4e9675d309cc78f049d0f457f8652f386f10133373f116a9eb655f43aff7372c9e84454805e8469aa7316b35f2fb
-EBUILD okteta-0.26.4.ebuild 1773 BLAKE2B 4f4b11017eb36dadaed81b0fe6dd62dc0d58ffbc36357ef4a3e670f1d4a2807674e04461759e33e58f5cb9fa909e40d1d2d9d4dff6c03d20507db6a9da1436eb SHA512 943ec81b68a0b3f1a540c239922e73998bfade879533842e16c5c8b615ce1b94fb023ba9a4aedc230315257122c3d156234ad0bb8f2cdaf90e9cb12116a1f865
+EBUILD okteta-0.26.4.ebuild 1771 BLAKE2B 32a6c29bc2f3bdb8cbd607c78c6f74007ec5997d6819ac2b4e6ba687440f501e6985c554dc8d3409783cb96b83d8ee1120fa42f7e0e43f1e2d0ef40baae28fe0 SHA512 e9f070af1cfc2969620dfc79232308b9cd0b4e9675d309cc78f049d0f457f8652f386f10133373f116a9eb655f43aff7372c9e84454805e8469aa7316b35f2fb
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.3.ebuild b/app-editors/okteta/okteta-0.26.3.ebuild
deleted file mode 100644
index d7762d4f7757..000000000000
--- a/app-editors/okteta/okteta-0.26.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.okteta
-https://utils.kde.org/projects/okteta/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE="crypt"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	ecm_src_test
-}
diff --git a/app-editors/okteta/okteta-0.26.4.ebuild b/app-editors/okteta/okteta-0.26.4.ebuild
index 4f2ba889d3b3..d7762d4f7757 100644
--- a/app-editors/okteta/okteta-0.26.4.ebuild
+++ b/app-editors/okteta/okteta-0.26.4.ebuild
@@ -17,7 +17,7 @@ https://utils.kde.org/projects/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index d320924af4a6..53c0ae2f3e8c 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
 DIST ReText-7.0.4.tar.gz 402934 BLAKE2B bae66a5fb8e81192d692d1a239706e2feee6ee940685cffdf3498880b2c9bd67cc85c6150e372a383e4bad13da210426fff95c06b2861b58020c2c6d298cf5d2 SHA512 cb12666b15414f4bf83f3b07c94d3bcba13dd3e6c3832c66520bfe8caafeeb87cc083a1e74530d98d6e00a00363add55fdf873e6de385e637876454130deebb3
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
 EBUILD retext-7.0.4-r1.ebuild 1846 BLAKE2B 3b30b9b5b486551f5ac7b1da324843ef7fbe6e0a8d2df3d787b52dc72b1e1a18e755c3cfe29e5b057d0fe4294c7da81263fe831fa44c80346d3f7094a6bc86cf SHA512 a8839bc8c0a3ca39649b6af774f8a65e496e21cd866059e67b7caf18403d6b247a3f917ade610ec074e00857e5374e05173f3e23a336859bc23a0731e5f1987a
-EBUILD retext-7.1.0.ebuild 1813 BLAKE2B 17b17a761aaad6c309ac8ad68598ec16d7393d614a35efa5ed85590fef2aa302de1b806b3e60f863b80987b6f278aa3c05e5a3572caf443c3e6731cbb7314ccf SHA512 949e409b38b31380f9550edd39ee0facf9c542a4d6b9417ae2b19c71e60e968f519ce51bd9986a193212259470d14c5964a169644f63cddd317aff33c39b0db7
-EBUILD retext-9999.ebuild 1808 BLAKE2B c4c846679a9a6dee6388122fabcabab56309bc0f03a9d7cf9959c4f09758ae201dda44a2c8f0eb73139d2c26aeb265879016760c39fba444b1be94e751f6528a SHA512 e0a004901fd67abfb52e988d081016b91b4f0baa2a1e8c4116f90e3afe8bc1ea65ec63a4e0d026df162b0ddbf3a63032564b27890d4f6ab252b2e463484e67fc
+EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 6035dcc2cc18d8058ab116873db58b1a97c65df58a813dae6136b59e1335c3addb198220669d7ea9bfe0274f427a1fbc146f4ff78f49ec61afb58852a340af04 SHA512 0221e5f05f50d2cf16dd625ab06e9421eefdfc889af1ab45cde6500031d8b695cc8585704f29dc3ba7c40cc55c6d54e9e7b3d685c2fdb2d257bed92c926c87fa
+EBUILD retext-9999.ebuild 1819 BLAKE2B 9c152888905c1a661ac3d733a86bbbc70fe6cd4e242be81d6be6c9e0f7850aa4b273a8641c5c1b536acb3c55502e418d97cdc5d9781177525cf230ab40bdd615 SHA512 fe8a0991975ccf2db9305373d5168319f5828a06c2804dd29704e3473eba3c7a3fb606da212bea5e1d3f2fc20f11b65b885dab8dc050bcdd69a2bcf0fa6cf6d0
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/retext-7.1.0.ebuild b/app-editors/retext/retext-7.1.0.ebuild
index 642512e6f452..3f4ce67e3805 100644
--- a/app-editors/retext/retext-7.1.0.ebuild
+++ b/app-editors/retext/retext-7.1.0.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit distutils-r1 eutils virtualx xdg-utils
+inherit distutils-r1 optfeature virtualx xdg-utils
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN="ReText"
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 72e36651206d..33902ed3198e 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit distutils-r1 virtualx xdg-utils
+inherit distutils-r1 optfeature virtualx xdg-utils
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN="ReText"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 47f183cc45d9..29c9769aff47 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -10,6 +10,6 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD vim-core-8.2.0360.ebuild 6906 BLAKE2B 1ecc1f692f3ff39c6b118dcd1e164075ad1bf333c44201fb28a24b15d97219eccaa1a3eafa9f31c7964d666f0bfbef0f7c15f449f47c1035b12e03ec8493d54d SHA512 07aa53185a7e8be5f04f69184d70d95bac4e3860da4fa302819e6f4ea0fc12de9549cc6c15c028a2a3911d1188e5ec1f0e76ee217c26b02b339b9453a1a9394c
 EBUILD vim-core-8.2.0508.ebuild 6932 BLAKE2B d48bf47e940afaf07e5bc895f8ebcca502743c7a7645769c1e6b03880b17dd7264bb0223f4303c26a1b0f91151e5fadc8b72787ab2b729efd04a216224463589 SHA512 e4c10050a8306994218defb29eabad1f0fddaf611636488894badd41c18788ff747bbd477626532fb8755f5a9ef663f2d1717c8f15ec2c0d5a88cf01f8ada153
 EBUILD vim-core-8.2.0638.ebuild 6932 BLAKE2B d48bf47e940afaf07e5bc895f8ebcca502743c7a7645769c1e6b03880b17dd7264bb0223f4303c26a1b0f91151e5fadc8b72787ab2b729efd04a216224463589 SHA512 e4c10050a8306994218defb29eabad1f0fddaf611636488894badd41c18788ff747bbd477626532fb8755f5a9ef663f2d1717c8f15ec2c0d5a88cf01f8ada153
-EBUILD vim-core-8.2.0814.ebuild 6932 BLAKE2B d48bf47e940afaf07e5bc895f8ebcca502743c7a7645769c1e6b03880b17dd7264bb0223f4303c26a1b0f91151e5fadc8b72787ab2b729efd04a216224463589 SHA512 e4c10050a8306994218defb29eabad1f0fddaf611636488894badd41c18788ff747bbd477626532fb8755f5a9ef663f2d1717c8f15ec2c0d5a88cf01f8ada153
+EBUILD vim-core-8.2.0814.ebuild 6930 BLAKE2B 62c2b406abca225bf821a4a38c7019c8401e8f61151ab0a47aecb025de70b647646a067510e65f46b9b73de416e5c917995e7dd791f1bc44f639fc35ffbcfef0 SHA512 be9da3a5baa0bec3f95d5ab4304987d11c83c6f9cd5f8e2576edd2c1dbd12a8b2e342bd28b55d9e82ce7533d5bd4bd19e1376b3f88b22f9b1de94bbc13d2e585
 EBUILD vim-core-9999.ebuild 6913 BLAKE2B 042200cf91aa6df1f07f39b105ccffac69241d046ad850f51a839ada0274e3b394834df838e906ff1f177e5cc388ddba5882a52ea3de21cecab0235a6dc44c6b SHA512 64523a67f38cd56d2641b51483d70baa3d71cfe7aed1e284916d63d2305a2fe6ecfd399f5c55f8f3892fa73ed0f5e026286a5f58d4c70d62c2b6b92fbff3d7a8
 MISC metadata.xml 372 BLAKE2B 6a58d097c342a656a226d27d236fb952b31fb4c71a29333a60ec42db7b8bb1ae601e3c717d9c0fda939ff17eab70be2150a0dfeb26ca5b3d786c9b6050efde86 SHA512 63bca13db3d5830cb58e6a848eb444e72ceaf442bf41be1858d80805dc36cc9b9cd363f480feb8dfe1c7bf09cf4685a665657353867742d13f10fd133eba66f2
diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild
index 28ba2d3038ab..48c30643b633 100644
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild
@@ -12,7 +12,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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 3b9f4bd96171..7ab846d697c8 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -8,6 +8,6 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD vim-8.2.0360.ebuild 9047 BLAKE2B 61761262f606478b9bf0d3ed8a1e33d88675409b559b821285ac819222f8fb20cf4d1a473310b22a0f066e34d2794fb747f9abd66b83457e0ebe050e9ca0bfd4 SHA512 4de6099691f5bb9cb991b794bcfb257b835cf20d3dcb79e3715b9ffc92696a74094cddbd143734854420218e96bf9c482625c4c8d1cf0a55aafc07e128ce6fd0
 EBUILD vim-8.2.0508.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
 EBUILD vim-8.2.0638.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
-EBUILD vim-8.2.0814.ebuild 9041 BLAKE2B 284edc7c7a8fe6b4e5e0ffaa39e36cdbebf1534eddd223c7a03e8136fb29ca14b5549a6282c1a3dd0b21df8abbef409ed07b16c33c342185a55aebe5e574ddaa SHA512 899f16275ed449611f6c212098a45db0b92ee3c06f3a96ae899a041a9a3668529dbaa07f7037d05469a06c47ee6d90d2d454c82e97ff9fc03bd7b6cea8839bf3
+EBUILD vim-8.2.0814.ebuild 9039 BLAKE2B 03f62c8cc9acf0058dabe6b5e319b401a1627c643691585971bd03bcdec28ba11e129dd11a86e353d46a65267e57a6d34103d37366d8c4663cc84b34f609e11d SHA512 51230a5977a33484484fd8dd7991ef84a0227aee31f5ee4d50da02370649cd3b10ec533a30ac17c35c3d9240ffd33beb9cb30b7a4fd4a09a86a39dccef08bcfc
 EBUILD vim-9999.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.2.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild
index f077cf006b4c..2e994d0cd840 100644
--- a/app-editors/vim/vim-8.2.0814.ebuild
+++ b/app-editors/vim/vim-8.2.0814.ebuild
@@ -15,7 +15,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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index d812314c83a0..c1f8751b01b8 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,7 +16,7 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0fed4b7fbba798b1746e177a727f5f82b69b897971995ed5fd40665224597f373ac244ad3f24e79966575464e65ca3 SHA512 0b66741feed43ec4d01f33fb557b5fb5e8d20a6b06d7be28271dd2492731c71ae54029929271dcdd26eea733db6420b843283dbf279c9433734c6688d2200f88
-EBUILD xemacs-21.4.24-r2.ebuild 7134 BLAKE2B 82534b136ce19a490fe9c7f4b199390dc9a35a187192651e480c4973978e0978f3b1eb0b1122473ca8e58768ef8f404632a71e1122f3c8522170704e448b8ccb SHA512 129287eb80b4266419c913322a153b3b3a187a71776b315f9533fc4355b8cb32c21980288660fb796aff2e3d0330e3853164e7da5ee3da5383ce452de55364e2
+EBUILD xemacs-21.4.24-r2.ebuild 7132 BLAKE2B 9be4cd45796c4a902cc0af0c42a9b1b63b8de00f7f25534b9e8fe0fe5dc1f81710eba92cece392c9f3dc63d65c6bee55c18e7b6b921f1f429856e2dae41198b3 SHA512 f45f7723262cc308d8caaff4c62edc436f008b0f0f11f5e107cab849d99cd868a9f88d1193d38b975fab597d01d2a4a9406078442872e1f93a334707946908ba
 EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186
 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
 EBUILD xemacs-21.5.34-r5.ebuild 7390 BLAKE2B 89344346e872dc22a2888e39dc5bab80b5a216600914ce13d3567508b4a8f6ae6ae7f8ea520e5731777d0817f96a12acd0aca22f20d3295102e3a6f2625824c9 SHA512 a0600d8b93ada5f905341295b9f23f212312ec8c3998cc2e4cb676184f7140b8d10cce4b9e2e08e323fd94996283f84cc2e5cc50a625659126e044231d25df4d
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 5eb8d525db8a..22186d5e0150 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 28cb735d497e..99054cc349e6 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,4 +1,4 @@
 AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 946 BLAKE2B f14b5b0458bd945036024ba1e60e6cdd93657e89c2f8c6f9c9dfc1121b83ac84acec69a9313223942571258cc9b8376641dcd40cd67f1709ea6ddca2aa280130 SHA512 7ce718160893430a6bc75e5a052798013964f28b15409f08e4d499068b58199c208292e6b6c9fe042dcadb9a17ca1cad62edcaa488ae0e3438243ced97be60a8
-MISC metadata.xml 325 BLAKE2B 7c4175f6741e1995a7285b616d1742039e06cfa7d7f59c67bf06ceed25410aa6bb7b07147e5d3aad0bd73b9a8c734a35d0978198e77d7ef16776a1d90a7e4df9 SHA512 fd55362003abd57da1426553ca63ab1ad8559045fd4214911861b40ed44439b7253a4b481112df6b5c3741f955e5a4e01a4717cc11babe5c23563ba25672bde2
+EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 950 BLAKE2B 49fe9c2eb89319395c7e0b7d9e86289da166310b790818f9090c44c7a7bf2dcab713d25c67141a19727360acf71e9a9253ee53e17189d7b0328e3352fe55d81c SHA512 664f046e92bcec6884509a775ec3fe9e83e7adcc955efc1a1cfa3c97a8565c9a4813c22f03d7c8aaff69c6a020eddd24cc694ba914cfe0677ccfc3f73b0632d6
+MISC metadata.xml 250 BLAKE2B 113a0d77e4ddd91ae5487bc89371d2973202f242a3c9a8899725295e62b51c0a64437ab158b40ba410c671f92fe3efb896b1446f7301e1f1e923baece1cb7e04 SHA512 20703a39d4150e2a8984fdaeb997da464e98e6abc363e5e07fee46954d5af19c861e40648fb238b763420349e3ebeaa4bf61a621ccff3ff77d6e629c61095bb0
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index 616d1c960db1..9420dcd8b820 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
-	<longdescription>
-	Fast, free, validating XML editor.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xml-copy-editor</remote-id>
 	</upstream>
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
index d56c500752b8..350ac3d80db1 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WX_GTK_VER="3.0"
 
-inherit autotools wxwidgets
+inherit autotools wxwidgets xdg
 
 DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
 HOMEPAGE="http://xml-copy-editor.sourceforge.net/"