gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-editors
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
74 files changed, 1475 insertions, 1375 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index c9c9787414d9..e90e820f3de8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index fb063ce8e1ac..aff840aff492 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,4 +1,4 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-EBUILD bluefish-2.2.10.ebuild 2734 BLAKE2B 58f70f1855bcd0aef08ac8ef4e51ae84e76c3af3ec4e3dd27063b849c8069fe3874edc5b42ba23c9986432ed07a64c05b9887e41fa4cb7eb8d253f0fa3c2dcd1 SHA512 f3687a84043c9fa6e9caa798cb1dcb6f4f3006a30c2cf9746e0e572dd765e2f3c6b171cc2bd759f365c987e2bdada2bb91f47c5b5278049e42bc825ff34ee22f
-MISC metadata.xml 462 BLAKE2B 71ac5de5f71ae32c79122cfefd6179047db2fa0cf758a5807b20985133364e798d440707abab3b0a5893227ad9d005dafb474b479e3d798343d9e92f7799d6bd SHA512 f861be3bcb1034ee6154f5b1327406ddc45c17bec3d328d8d1489a9747160bfd349aabf86c3a90ed94c1662494a25014a0ec9730a7f9789014a10754b777ad98
+EBUILD bluefish-2.2.10.ebuild 2556 BLAKE2B 910fea9618911f35362e3162fb4c16e1eea08c954898500bf30256b49c194513aef6185b506d91fa1996b795d9dbfc96a4b14411ab677c364c4bf3bf176a6598 SHA512 e84bd7bc879ec41696fceb944a525d8d6b7ffbe0a339f1c6da3c20cd96bbfa551a832800095d794a4c0837aeeb359371db6d7698de01130459be375dd855eb04
+MISC metadata.xml 386 BLAKE2B d8663af89654394ea695c309c2ebbf2d3beba02463b2e57a0f91d7699af0e6457fa0ef0aa238f76359d3531bf4831475978fdd8ab4eb943dccc295e294b2eb4d SHA512 589c6c5db0ad2b93d2b44284faa19845b48e790252ecf5983fb3ba2c2b749894a382eea6dffe053413c0b29b86063a8906b88ae6f165b1cc9fc79742ae2fc188
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
index dba37b3e1c68..324637670ba0 100644
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.10.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils python-single-r1 xdg-utils
+inherit autotools gnome2-utils xdg-utils
 
 MY_P=${P/_/-}
 
@@ -16,8 +14,7 @@ HOMEPAGE="http://bluefish.openoffice.nl/"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+gtk3 gucharmap nls spell"
 
 RDEPEND="
 	sys-libs/zlib
@@ -26,7 +23,6 @@ RDEPEND="
 		x11-libs/gtk+:3
 		gucharmap? ( gnome-extra/gucharmap:2.90 )
 	)
-	python? ( ${PYTHON_DEPS} )
 	spell? ( >=app-text/enchant-1.4:0 )"
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
@@ -48,8 +44,6 @@ pkg_setup() {
 		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
 		ewarn "Disabling charmap plugin."
 	fi
-
-	use python && python-single-r1_pkg_setup
 }
 
 PATCHES=(
@@ -71,7 +65,7 @@ src_configure() {
 		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
 		$(use_enable nls) \
 		$(use_enable spell spell-check) \
-		$(use_enable python)
+		--disable-python
 }
 
 src_install() {
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 98078743b336..52c7b2542143 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -5,7 +5,6 @@
 	<use>
 	<flag name="gtk3">Enable GTK3 interface (default)</flag>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
-	<flag name="python">Enable Python integration for zen-coding plugin</flag>
 	<flag name="spell">Enable spell checking capabilities via enchant library</flag>
 </use>
 </pkgmetadata>
diff --git a/app-editors/editra/Manifest b/app-editors/editra/Manifest
deleted file mode 100644
index 83cea3d506be..000000000000
--- a/app-editors/editra/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX editra-0.7.20-wx30.patch 2264 BLAKE2B a8244a8174d1b0bca8c8e4979623ebc9ea03838eff59e9c9b12c1c703c6c69b90ff3036a1bf68e2757f7d95fa706aef37df831fc0c0f01b9c1ffe9d570b14769 SHA512 c0befbe2fb2eead2c4fc066767b48938b0f2b17949dc42fd98128d63556268a12b73fb49f22a8e9abf524e4450bda2b2b4e0b4953bc7f3c7c32b6ba1e7eefe63
-DIST Editra-0.7.20.tar.gz 4072243 BLAKE2B 3a2d38888ea9d7a12a77d4adb57b7e5c926757791e8b48eedd8413b6712cbfb2c616c3cf26f3f49c3a7ac5acf37d373cff8d37c63e255a1d0a9ec1add3dcbbe6 SHA512 e568ce2a5f04300c33223bf7a0e6fbc52d0a51c3472afb9b613fe21cfbeba0b9b453d87837e52c7c48050fc266ff5ff194a42f797053f21f0a25cd5c4579febe
-EBUILD editra-0.7.20-r2.ebuild 1258 BLAKE2B c25df6f3bddc92f8dee6a0cb2c4fdf0d6b241769cb5e5c4c5f2beefe2f8646c7725b7b6bd385b5f9ad39aaacdc6196d762df0bf5a0b75ad23d187e36ce63fe06 SHA512 ea516785ccd2909bb9d784beb6a0dfe92a0aad9bb45d6ff0e9f214a129812a2a8c08ecd9181d19ddbe807b8fa80575ed85aeb04bc69b095973ced7551998185b
-MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-editors/editra/editra-0.7.20-r2.ebuild b/app-editors/editra/editra-0.7.20-r2.ebuild
deleted file mode 100644
index 04cfc91b0dfe..000000000000
--- a/app-editors/editra/editra-0.7.20-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1 fdo-mime
-
-MY_PN=${PN/e/E}
-
-DESCRIPTION="Multi-platform text editor supporting over 50 programming languages"
-HOMEPAGE="http://editra.org https://pypi.org/project/Editra/"
-SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="spell"
-
-DEPEND="
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]"
-# setuptools is RDEPEND because it's used by the runtime for installing plugins
-RDEPEND="${DEPEND}
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-wx30.patch" )
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_compile() {
-	# https://code.google.com/p/editra/issues/detail?id=481
-	distutils-r1_python_compile --no-clean
-}
-
-python_install() {
-	distutils-r1_python_install --no-clean
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "${S}"/pixmaps/editra.png
-	make_desktop_entry editra Editra editra "Utility;TextEditor"
-	dodoc FAQ THANKS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-editors/editra/files/editra-0.7.20-wx30.patch b/app-editors/editra/files/editra-0.7.20-wx30.patch
deleted file mode 100644
index e5e7b7f918d6..000000000000
--- a/app-editors/editra/files/editra-0.7.20-wx30.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Updates for better wxPython 3.0 compatibility
-Author: Olly Betts <olly@survex.com>
-Bug-Debian: https://bugs.debian.org/758947
-Forwarded: no
-Last-Update: 2014-08-30
-
---- editra-0.7.20+dfsg.1.orig/src/ed_main.py
-+++ editra-0.7.20+dfsg.1/src/ed_main.py
-@@ -432,7 +432,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
- 
-             dlg = wx.FileDialog(self, _("Editra: Open"), fdir, "",
-                                 ''.join(syntax.GenFileFilters()),
--                                wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR)
-+                                wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_CHANGE_DIR)
-             dlg.SetFilterIndex(_PGET('FFILTER', 'int', 0))
- 
-             if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-@@ -680,7 +680,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
-                             os.path.dirname(sdir),
-                             title.lstrip(u"*"),
-                             u''.join(syntax.GenFileFilters()),
--                            wx.SAVE | wx.OVERWRITE_PROMPT)
-+                            wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- 
-         if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-             path = dlg.GetPath()
-@@ -713,7 +713,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
-             dlg = wx.FileDialog(self, _("Where to Save Profile?"), \
-                                CONFIG['PROFILE_DIR'], "default.ppb", \
-                                _("Profile") + " (*.ppb)|*.ppb",
--                                wx.SAVE | wx.OVERWRITE_PROMPT)
-+                                wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- 
-             if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-                 profiler.TheProfile.Write(dlg.GetPath())
-@@ -732,7 +732,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
-         if evt.Id == ID_LOAD_PROFILE:
-             dlg = wx.FileDialog(self, _("Load a Custom Profile"),
-                                 CONFIG['PROFILE_DIR'], "default.ppb",
--                                _("Profile") + " (*.ppb)|*.ppb", wx.OPEN)
-+                                _("Profile") + " (*.ppb)|*.ppb", wx.FD_OPEN)
- 
-             if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-                 profiler.TheProfile.Load(dlg.GetPath())
diff --git a/app-editors/editra/metadata.xml b/app-editors/editra/metadata.xml
deleted file mode 100644
index 0c7ee856e108..000000000000
--- a/app-editors/editra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>wxwidgets@gentoo.org</email>
-		<name>Gentoo wxWidgets Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 95589b3e2503..d24842d56bba 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,17 +8,13 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
-DIST emacs-27.0.90.tar.xz 43706980 BLAKE2B 87f9b621305711d7083307fbf921a32e7a878c6eef7939100511f669fdf052d88d8aea3c46a2c9fb9e9383c47c4066ec580443b2b24e510a6894d59caf9825ec SHA512 1a6f319e964f20ad35574eb2d2e18ae8c86d9d2ab9ae038334f0f468c40602d1f9b20880cfa704ea2067bdd7a3952ea3e6b565d5bb3d6d304922ad1d98c1c76b
-DIST emacs-27.0.91.tar.xz 43730296 BLAKE2B 9ed0f425539cd22b84e3c1e2973d6a66d983e6b6de5fff30c1db2ca3fb1d761cf2c4de566b28dcffff858d032ff996a528e14daaecc45eb71aa07c3f3a6e4a74 SHA512 fcae087c7d153ce45640dc5785e0829e85b14400eec70f833e1f7ee7d3903f1e4adb469d812596fc6e7ff792ccaeda3fde5fa1c37b609ab83e8432d9f63be36a
+DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 EBUILD emacs-18.59-r12.ebuild 4461 BLAKE2B 894572f7e472d2f79ffa2baef17602763072c0b4fe20e511208a346dbe8a655e6674be680c96a96a9d1312d84eaed8647d8c194037c990869c954f5791ac4f30 SHA512 c5b153cc299fdb5568301794aea6943cd39be2a7b3dafa5d39c8d3debd6a3a48279592b9bd116f8079335105e691b52a3dfe10f94f8777b4a404af4678088d1a
 EBUILD emacs-23.4-r18.ebuild 10977 BLAKE2B 8e44c5f9f219081485ad0e923400e31cac34f76eea114f7e1d1619e884383680bfa2926966664c3a298bdf75dbb85f3b90dfc94b51f1b7c7669978c7e630dabc SHA512 e1ae3906e405d95e724ca3b79655a7e27eb4881d7a5589a7df383caf96a24f26f275f043ce54c0478130a711b0e1d06108c3943613088969f976883ab5fd9e5c
 EBUILD emacs-24.5-r7.ebuild 10764 BLAKE2B bb9a3be1061b105c1c4eee45ce983e80b0a914dd3848951bac2ae4ace4b7b7a830741169d1e75ea85753247310eae94066a739da76dfeb0bcf6c43b7b1418a3e SHA512 5079762e2e811379dfa5ab124b0574d93aa2c2a01998426e92bec83ed2fcae5b11a7efd49ffb23f95ed3dad5ee5b8d2cd60261c716ee4bce4082499acadcf273
-EBUILD emacs-25.3-r6.ebuild 11100 BLAKE2B 18140ddfd34e3434632cb6953a64764df34950024b08f459e57846886b456769d1a0467342ac5bb0797502a589600777aa5d9659d98e7db68f3aec3b8d6db6b9 SHA512 72d7d3cc11214324da56dbb4d2c57750b73bb085feb1e353f5d690066fd0b06e3ecbe617c4778a42078ef45de3745628e9b406bcaa6c4bf1d6ead2f0a19106c6
-EBUILD emacs-26.3-r1.ebuild 11887 BLAKE2B c598a530fcb8c470d8f8d4d3a1106bd8acddb2d03e660be00282fa173d87c68585ca7cf171d64c3d11bdf0cdb5e3ef7e2b54db67fb93af03e66f9575802d5032 SHA512 40e57173380373d8855f6f599d25417dc468da51483109054d1df4b8eea85a53f10e85f958e405d8bf7948bc61e19afa412da7a51755f7ea3c907bd598aa7359
-EBUILD emacs-27.0.50_pre20191223.ebuild 12898 BLAKE2B ebeef6a8ea281e8549fe6eafaeac049e66f24a18c4bc65358afc8a5ea89b8cac9b51d554f4b2e4881ae43a8b41b8bb02bf37a719c03e1b3bd4d0a5740662308b SHA512 89ec7e4c0f2e4ee776e28d8da10666e712b076817a7c34a31f74d9c9173f6ec4a9857016c4c2b6a8b3bace442bd49b8ecfb1814cf49f8479f1bafc4370f15261
-EBUILD emacs-27.0.90.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
-EBUILD emacs-27.0.91.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
-EBUILD emacs-27.0.9999-r1.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
-EBUILD emacs-28.0.9999.ebuild 12871 BLAKE2B 7aa3322befb032b60349d2b5ba2311429b3110428130cd0552bb2397dfd7c89ebad55f8f6f9fc576287c1af162e7d43145393be3e693c27e3fdfad00102e37bf SHA512 11d00e05d8053659dc025755262f46c9d8e4b37aba4492b366f9bda19edc5e9a46932a543410377c9dc6d17a01495b36592bb9f163f5d3fa968aa16e5ba27b03
+EBUILD emacs-25.3-r6.ebuild 11106 BLAKE2B 9e929e3ac144808109478312fb4977c472df10c677551ed9e69d43bf2ced0090df2dd0c6dee97a7491db64228e8972e0f00f2faba755425efaf64c9b15c6ccd2 SHA512 9249376d8b20d553ee6c09a7610315dc6a4c3c845d9e67505b54ddc4b21cf8b9502d30aa57255b109d0c28e8f18b5ca9e66f8b470761241a5de497eb4d0daee7
+EBUILD emacs-26.3-r1.ebuild 11893 BLAKE2B c51762efee73ded3fba50816ef9ca156b319af2325f9c88998fb4f3ca90248140f375b5b21f282cd8d49dc2d4fe474c788fc307029d10419c6b63cb4f476b942 SHA512 06ba725741f39b884dce1b183384173407f78dd72ecf3acad6900c1a2c49ec3dd0818ba3ce69a8aabc60d98498839002224f0cc7ee0caa6447e2ce59290924a4
+EBUILD emacs-27.1.9999-r1.ebuild 13402 BLAKE2B da1272c9cf8c419c078958f6256312572c0027d4a712a72075351f8700e51939853448989539cbddb21eec5c83ceb53b15fa40d3673ffd218d6638e7aeb59ec5 SHA512 cc08d78ee2fa1cb62e241490fbc225066683d84ce862523dbe619bebd3add1c8fbf6c55992681329fd82556d3a5f5a447c2c63101af1612b1221f321b2e96a82
+EBUILD emacs-27.1.ebuild 13445 BLAKE2B b6f97454b4678468d5c02b1c9b90ce453816329e90b02b48b5974dbd5194be7e9375bb1beda83c32d20fac36cd3f205b400dadcbd035460f1b1905df3abc31cd SHA512 2cde3a39baa1fb6ce36bde553f45c70b7d280409fd60e9838f107bad25d485a9a6bfca882d37689cd383d5d2ada220ebc8e3fea7639fa966735796dbc88aa4cd
+EBUILD emacs-28.0.9999.ebuild 13373 BLAKE2B a874c9d10df48c2b4b2b151686d5099902be4d7c53e4d62ab2c4151ce4c355d3338faed03509dabfecf6f57ef0338ffc61b39874e345c1a338ce68ef41828b77 SHA512 48fa433032d421a1cd64bb1188e6265748f0946c71a732a80f8c52fa87cfe89b7bd438785fac849f8bfa160db52ad924c318b1eff962a5a58520d6fa7fc05cce
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 18e79d8a04ad..c5fbd04048e8 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -313,9 +313,10 @@ src_install() {
 		/usr/bin/emacs through the Emacs eselect module, which also
 		redirects man and info pages. Therefore, several Emacs versions can
 		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
 	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 2d976a0d1f76..334f327910fc 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -339,9 +339,10 @@ src_install() {
 		/usr/bin/emacs through the Emacs eselect module, which also
 		redirects man and info pages. Therefore, several Emacs versions can
 		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
 	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
deleted file mode 100644
index b16211b43e36..000000000000
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-dumping=pdumper \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
deleted file mode 100644
index 6b20eefd9d28..000000000000
--- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-dumping=pdumper \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 6b20eefd9d28..78fc06dd7e03 100644
--- a/app-editors/emacs/emacs-27.0.90.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -11,23 +11,35 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_BRANCH="emacs-27"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
 else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
 	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	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"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
@@ -369,9 +381,10 @@ src_install() {
 		/usr/bin/emacs through the Emacs eselect module, which also
 		redirects man and info pages. Therefore, several Emacs versions can
 		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
 	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
diff --git a/app-editors/emacs/emacs-27.0.91.ebuild b/app-editors/emacs/emacs-27.1.ebuild
index 6b20eefd9d28..9258d36369f9 100644
--- a/app-editors/emacs/emacs-27.0.91.ebuild
+++ b/app-editors/emacs/emacs-27.1.ebuild
@@ -11,23 +11,35 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_BRANCH="emacs-27"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
 else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
 	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	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"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
@@ -123,6 +135,7 @@ BDEPEND="app-eselect/eselect-emacs
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
+	!<=app-editors/emacs-27.1.9999-r0:27-vcs
 	!app-editors/emacs-vcs:27
 	app-eselect/eselect-emacs"
 
@@ -146,7 +159,7 @@ src_prepare() {
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
-	AT_M4DIR=m4 eautoreconf
+	#AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
@@ -369,9 +382,10 @@ src_install() {
 		/usr/bin/emacs through the Emacs eselect module, which also
 		redirects man and info pages. Therefore, several Emacs versions can
 		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
 	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index fbe5d94d188c..8137dcdd89b8 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -11,23 +11,35 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_BRANCH="master"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
 else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
 	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	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"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="28-vcs"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
@@ -368,9 +380,10 @@ src_install() {
 		/usr/bin/emacs through the Emacs eselect module, which also
 		redirects man and info pages. Therefore, several Emacs versions can
 		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
 	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index f4c8195a9661..d0b5cc57157d 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-plugins-3.34.1.tar.xz 978800 BLAKE2B 03225ddc414e172f08179c64fbf12d0282c131b71855ca9dc20ceaa5750a5555c7bdde8c4ff1d95c721177b3d379edbcfc9af19ec22b96942df1913d13560303 SHA512 7fe31c2b0a1381a44362bd6066422d182b2246e3f903f8cd83cde0467b9853620a445bea7878d93e95a0a71ac5d5dd081a1930d602007cf2a6ef00b1a45bebfc
+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 2725 BLAKE2B 377335c8a74465a5202b16766b962b243627fba7f7e89689d069c497292b8aefa97ebf84ba670a9d33989505d01dd14f1e33b0b4ba0b453adb3ea69268ab2b8c SHA512 1434c2e4a1f8771d3555bf699a0e3090d745fa0c69f47955f6a7bc959c304629de1524b504bc01b89cb3ee07eb536eef2bf0b9c99b197e63216374934ab9dab1
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild
new file mode 100644
index 000000000000..44c04dbe3953
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE="charmap git +python terminal vala"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=app-editors/gedit-3.36
+
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=app-editors/gedit-3.36[introspection,python,${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
+			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		')
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-4.0.2:4[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplugin_bookmarks=true
+		$(meson_use python plugin_bracketcompletion)
+		$(meson_use charmap plugin_charmap)
+		$(meson_use python plugin_codecomment)
+		$(meson_use python plugin_colorpicker)
+		$(meson_use python plugin_colorschemer)
+		$(meson_use python plugin_commander)
+		-Dplugin_drawspaces=true
+		$(meson_use vala plugin_findinfiles)
+		$(meson_use git plugin_git)
+		$(meson_use python plugin_joinlines)
+		$(meson_use python plugin_multiedit)
+		$(meson_use python plugin_sessionsaver)
+		$(meson_use python plugin_smartspaces)
+		$(meson_use python plugin_synctex)
+		$(meson_use terminal plugin_terminal)
+		$(meson_use python plugin_textsize)
+		$(meson_use python plugin_translate)
+		-Dplugin_wordcompletion=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 6ef49f61835b..199bc3d079b3 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,4 +1,9 @@
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
+AUX 3.36-make-gspell-optional.patch 2126 BLAKE2B b4e56744d3ece3e380c1aa628c02237ec8b36fa1c2b9efeee30391cbe9e3d5016e540862b25404ec4f807d9dfb3b78c2a6dc5f5ead2a71dbf4889d78af4cc2b1 SHA512 5916685a00ffa2f1b6f0b0ae77f5165a0199a40eb87e32d00a534d5049454df8aba9c1ba507fb5c1b8c4009c1c1689b962d2051a70173fd335007d5872eeaad0
+AUX 3.36-make-python-optional.patch 2509 BLAKE2B d88b0bf53e37cf20520b5d22565e3ecdfadb112751345784c962747602fd086cf238196ef33c340e228d0aa799631645d5b250bbaa650acfcb387000409405cf SHA512 bc87270a19d8f067ba5d7e697468526a931e020959b04bb1c824dcdf8ca5fe5799cfbf53b1b6e70862a7badbc7a0be98b34cbae1e3cabf90cbfccfd7d6c81b83
+AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
 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 2437 BLAKE2B 14efed99caf20b9b9f17273dfb154f20dc762828b8a96aabee27ad934bd85b4d78f0118fb79c993cbe01bb5c97f88b5d97e5759782a87eb64e68be6c648e7614 SHA512 c04d6e7de40ae7ea5a1bab49e54bbab8f887748ee1b91345abace117dd8e54a3fb088d524f00e575ebc82cb65ebbf8dc6d33de5d4ac43bc87d8d5b34fd4fa462
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.36-make-gspell-optional.patch b/app-editors/gedit/files/3.36-make-gspell-optional.patch
new file mode 100644
index 000000000000..e891f98f0c00
--- /dev/null
+++ b/app-editors/gedit/files/3.36-make-gspell-optional.patch
@@ -0,0 +1,62 @@
+From d622460b08c7c13ce8e0c23e3afcbd1e4c65d019 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 16 Aug 2020 23:20:31 +0300
+Subject: [PATCH] build: Make gspell optional
+
+---
+ meson.build               | 3 ++-
+ meson_options.txt         | 4 ++++
+ plugins/spell/meson.build | 4 ++++
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index edb2896a6..b8707f33d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -63,7 +63,7 @@ libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_req)
+ 
+ libgd_dep = libgd_subproject.get_variable('libgd_dep')
+ 
+-gspell_dep = dependency('gspell-1', version: '>= 1.0', required: true)
++gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
+ x11_dep = dependency('x11', required: false)
+ 
+ introspection_dep = dependency('gobject-introspection-1.0', required: false)
+@@ -154,6 +154,7 @@ summary = [
+   '        User documentation:    @0@'.format(get_option('user_documentation')),
+   '        GObject Introspection: @0@'.format(generate_gir),
+   '        Vala API:              @0@'.format(generate_vapi),
++  '        Spell checker plugin:  @0@'.format(gspell_dep.found().to_string()),
+   '',
+ ]
+ message('\n'.join(summary))
+diff --git a/meson_options.txt b/meson_options.txt
+index d0cbf0720..03e07244e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,10 @@ option('gtk_doc',
+        type: 'boolean', value: false,
+        description: 'Build API reference for plugins (requires gtk-doc)')
+ 
++option('spell',
++       type: 'feature', value: 'enabled',
++       description: 'Build spell checking plugin')
++
+ # This option exists for the developers, to speed up the install.
+ option('user_documentation',
+        type: 'boolean', value: true,
+diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
+index 8ce7634b7..cccb42fc1 100644
+--- a/plugins/spell/meson.build
++++ b/plugins/spell/meson.build
+@@ -1,3 +1,7 @@
++if not gspell_dep.found()
++  subdir_done()
++endif
++
+ libspell_sources = files(
+   'gedit-spell-app-activatable.c',
+   'gedit-spell-plugin.c',
+-- 
+2.20.1
+
diff --git a/app-editors/gedit/files/3.36-make-python-optional.patch b/app-editors/gedit/files/3.36-make-python-optional.patch
new file mode 100644
index 000000000000..c27a0551f00b
--- /dev/null
+++ b/app-editors/gedit/files/3.36-make-python-optional.patch
@@ -0,0 +1,90 @@
+From d082ef03b9f545980ab77e6c0a20d5bf4893be69 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 16 Aug 2020 23:34:42 +0300
+Subject: [PATCH] build: Make python optional
+
+---
+ gedit/meson.build   |  2 ++
+ meson.build         |  4 +++-
+ meson_options.txt   |  4 ++++
+ plugins/meson.build | 11 +++++++----
+ 4 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/gedit/meson.build b/gedit/meson.build
+index 075c001b2..174deba04 100644
+--- a/gedit/meson.build
++++ b/gedit/meson.build
+@@ -214,6 +214,7 @@ if generate_gir == true
+     install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
+   )
+ 
++if get_option('python')
+   python3.install_sources(
+     'Gedit.py',
+     subdir: join_paths(
+@@ -221,6 +222,7 @@ if generate_gir == true
+       'overrides',
+     )
+   )
++endif
+ 
+   libgedit_dep_sources += [
+     libgedit_gir,
+diff --git a/meson.build b/meson.build
+index b8707f33d..4e40833ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -69,7 +69,9 @@ x11_dep = dependency('x11', required: false)
+ introspection_dep = dependency('gobject-introspection-1.0', required: false)
+ vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
+ 
+-python3 = python.find_installation('python3')
++if get_option('python')
++  python3 = python.find_installation('python3')
++endif
+ 
+ build_checkupdate_plugin = host_machine.system() == 'windows'
+ if build_checkupdate_plugin
+diff --git a/meson_options.txt b/meson_options.txt
+index 03e07244e..cdcec6165 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,10 @@ option('gtk_doc',
+        type: 'boolean', value: false,
+        description: 'Build API reference for plugins (requires gtk-doc)')
+ 
++option('python',
++       type: 'boolean', value: true,
++       description: 'Install GIR python overrides and python plugins')
++
+ option('spell',
+        type: 'feature', value: 'enabled',
+        description: 'Build spell checking plugin')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index a9167f8d6..97f1b1765 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -20,13 +20,16 @@ if build_checkupdate_plugin
+ endif
+ 
+ subdir('docinfo')
+-subdir('externaltools')
+ subdir('filebrowser')
+ subdir('modelines')
+-subdir('pythonconsole')
+ subdir('quickhighlight')
+-subdir('quickopen')
+-subdir('snippets')
+ subdir('sort')
+ subdir('spell')
+ subdir('time')
++
++if get_option('python')
++  subdir('externaltools')
++  subdir('pythonconsole')
++  subdir('quickopen')
++  subdir('snippets')
++endif
+-- 
+2.20.1
+
diff --git a/app-editors/gedit/files/restore-overlay-scrollbars.patch b/app-editors/gedit/files/restore-overlay-scrollbars.patch
new file mode 100644
index 000000000000..55a353a796bf
--- /dev/null
+++ b/app-editors/gedit/files/restore-overlay-scrollbars.patch
@@ -0,0 +1,26 @@
+From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Fri, 20 Mar 2020 11:32:59 -0500
+Subject: [PATCH] Revert "ViewFrame: disable overlay scrolling for the
+ GtkScrolledWindow"
+
+This reverts commit 5e0909c19f267b4023131881fac89c58a2a17453.
+---
+ gedit/resources/ui/gedit-view-frame.ui | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
+index ebf70b013..4c783c711 100644
+--- a/gedit/resources/ui/gedit-view-frame.ui
++++ b/gedit/resources/ui/gedit-view-frame.ui
+@@ -11,7 +11,6 @@
+         <property name="visible">True</property>
+         <property name="hexpand">True</property>
+         <property name="vexpand">True</property>
+-        <property name="overlay_scrolling">False</property>
+         <child>
+           <object class="GeditView" id="view">
+             <property name="visible">True</property>
+-- 
+2.25.1
+
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-3.36.2.ebuild
new file mode 100644
index 000000000000..4675b0a08910
--- /dev/null
+++ b/app-editors/gedit/gedit-3.36.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python gtk-doc spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+
+# X libs are not needed for OSX (aqua)
+DEPEND="
+	>=dev-libs/glib-2.52:2
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
+	>=gui-libs/tepl-4.4:4
+	x11-libs/libX11
+
+	spell? ( >=app-text/gspell-0.2.5:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+"
+BDEPEND="
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+PATCHES=(
+	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
+	# disagree with; those wanting them off in general would set that globally for gtk
+	"${FILESDIR}"/restore-overlay-scrollbars.patch
+	# Make gspell and python optional
+	"${FILESDIR}"/3.36-make-gspell-optional.patch
+	"${FILESDIR}"/3.36-make-python-optional.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use python)
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_documentation=true
+		$(meson_feature spell)
+	)
+	meson_src_configure
+}
+
+# Only appdata and desktop file validation in v3.32.2
+src_test() { :; }
+
+src_install() {
+	meson_src_install
+	if use python; then
+		python_optimize
+		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index e4174833a4d2..4f05be6b503a 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0
+DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390
 EBUILD gnome-latex-3.32.0.ebuild 1134 BLAKE2B d339878e8113de26c5f8bab86e471f5aea90bd294d6aeac745c70547089ed96a70f59354f28b29f5838508370d32f3458e21aa4aaf2b70c3a382f443db84d102 SHA512 d1b8e7bb41903bf47c7a87543c3dab4566a19fc51ce9edf1be7e90af2aa17bdfa3a43bdde308f33918941f022122897269718895ebb32bd4b182c934495f7400
+EBUILD gnome-latex-3.36.0.ebuild 1136 BLAKE2B 301468830700638517ca08a35987ed7a9a329695c7afdee46c3b5e0adb1a08f3435b6575d19dba9cfddf857684006bf4b7b057a33cf92ac246043d1abd8fecdf SHA512 44933d836eb35570141c26e1bb7a788d8a7af65e287c550facfa45d596ced1fb7e20a51b52471be8eb9a621c5619697fed053ea91c8fb4a8f8806637e9e0b6a9
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
new file mode 100644
index 000000000000..6f67a58c26fc
--- /dev/null
+++ b/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+COMMON_DEPEND="
+	>=app-text/gspell-1.8:0=
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0:4
+	>=gui-libs/tepl-4.4:4
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	gnome-base/dconf
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-dconf_migration \
+		APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 9e27d3d4cbe9..d4271f67630e 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,6 +9,6 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD gvim-8.2.0360.ebuild 10326 BLAKE2B 4fd00bb56f9cac3143d22d7d080046a4ac76a8d64b13ede6614527aa5c69603b792f5b0ec5efb9284978a1c782454211bf23ed25fb96e6994352602bc97b350e SHA512 37b60dcc8805c6aef6e1b1a3bb93fa96ad6b12a66614f30858018f369843d77ab57040656b710fd818bc2c823a43202ce52dff5a6aff1e1912298a72e51ea2cd
 EBUILD gvim-8.2.0508.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
 EBUILD gvim-8.2.0638.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
-EBUILD gvim-8.2.0814.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
+EBUILD gvim-8.2.0814.ebuild 10320 BLAKE2B f0cc97277892726264f6db574fe900c9bf67d5b2129cb15a509dd8848a0c8f9310975430a53fa1bffe62d6d94df53603e54194eaa7a1eb17edc78be22e343129 SHA512 dc45775945bcc40913afd9d0bbac3eb6ab5c789dd7621736f4202aa1ae7446083132db353120ba6d781ec63620b33c98cb31a4f390dfadcfae32f53bdc1acca0
 EBUILD gvim-9999.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0814.ebuild b/app-editors/gvim/gvim-8.2.0814.ebuild
index 3542682bc039..15593afef335 100644
--- a/app-editors/gvim/gvim-8.2.0814.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814.ebuild
@@ -200,7 +200,7 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
 		$(use_enable python python3interp)
-		$(use_with python python3-command $(type -P $(eselect python show --python3)))
+		$(use_with python python3-command "${PYTHON}")
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
 		$(use_enable selinux)
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 44f3505f69b2..743529d0e461 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -5,5 +5,7 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1414 BLAKE2B 6baa7517d6218432641a95c1c79a865b0f1f63b9fcb06571f9fe0414a903194e943b1d4c5c200ee5363a0cad84fc3c24a1e5fafd166d73922cda0e16dd7ab153 SHA512 12f147751d3da898d9336e34fa795bbe3a315ab430995af6c47ea8babacb61b386ebf0186e6cc18f8db93f9e5a03e5873073c49fb79afa9192898cb3882d1be8
+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 1066 BLAKE2B f44562a6c4f0359042e2e525a1e158ce1aac4a5a1806f5c75fee6c37d161ae0215338a7555bd36913f2d23517eac3ea162e58cd970d2024e9faf8655054c354d SHA512 c5cadfdc864261da6b2258cbc8d225fed9c1becc6da162bd65598e59be29b4766ec2f8036c867728680fb251c0ddc759989ebe2514aa465db3814810a6e5ec22
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 5b912857bc6f..1660e108bde7 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
new file mode 100644
index 000000000000..17e1639f8b24
--- /dev/null
+++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+# tarball is done as: 'make dist' and then rename to mention latest commt
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.gz"
+
+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/_pre*}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-tinfo.patch
+	"${FILESDIR}"/${PN}-2.1.0-gcc-6-uchar.patch
+)
+
+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/leo/Manifest b/app-editors/leo/Manifest
deleted file mode 100644
index 9056608e27e5..000000000000
--- a/app-editors/leo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST leo-5.6.tar.gz 9255687 BLAKE2B 46a9aa1d90a1663ece57731b3685def3bf050f2c398310aca9d24c07256d23e40a94e505c43bd90c6c5a58fda2021409d3e6510eddd5a1bc0533273c45495475 SHA512 c9f6583be4f6a76d781adccc4076782c6f136b1057796228a398cd31c92d61e1b7a86d151f36352c6b1f677bb3d298b6f347c9874e3782c645fdb6ee38747955
-EBUILD leo-5.6.ebuild 814 BLAKE2B dd44ea7d558f405d76b6a2ff47f113c1c7b0599c40b075cf397975999ab5a3605a8afd93f063f2d17e912f315be2faa84a634e0c8106a60df476852d2b03549a SHA512 416fb44fae4634fd72a5f14ab2816275d68b3c178499159836044db84cfee6f704548f4588b475be8dce19d1b67174ec0fc55157183800a34ec75c728f23a833
-MISC metadata.xml 308 BLAKE2B 2c8d0a692156e40f0d67d490212ded6b82a67efb0450e6512db856cc108772745dbcc5fade6b866b85bf07b4416db3357d3c04f3287ef8958477e6008828a8a3 SHA512 cfa3bb11079aca56b6b381f365e655078a1f07738c3af9d6c7d10313ee0a6826c0f40cc70e8ff31be6bf033a5effc8a7d725bccda8f78341700df10717976c66
diff --git a/app-editors/leo/leo-5.6.ebuild b/app-editors/leo/leo-5.6.ebuild
deleted file mode 100644
index 2ee3cdc76dc0..000000000000
--- a/app-editors/leo/leo-5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-editor-${PV}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQUIRED_USE="tk"
-inherit distutils-r1
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="https://github.com/leo-editor/leo-editor/"
-SRC_URI="https://github.com/leo-editor/leo-editor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	app-text/silvercity[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	cp leo/dist/setup.py leo/dist/leo-install.py . || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( leo/doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-editors/leo/metadata.xml b/app-editors/leo/metadata.xml
deleted file mode 100644
index 4e9fe29019ce..000000000000
--- a/app-editors/leo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">leo-editor/leo-editor</remote-id>
-    <remote-id type="sourceforge">leo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 510eda947e7b..f1a534b5e294 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,3 @@
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
-EBUILD mousepad-0.4.2.ebuild 1142 BLAKE2B b40e37fd3724bdc4da85e4d903719e7874b238cdac06beb2e4e13106d8003cb986133fe2ff25e729676e362fed702ab4ccb11826f174ba2549bfee018517ba7a SHA512 57d209fbedf6b692464384e1ff84beb5eff47ed20e9a6a4fdfab51e58bef068d7419d12b875f5f98ff6aab5db5e8bd210e182a2cc297b85fb47c79b28500a1b5
+EBUILD mousepad-0.4.2.ebuild 1147 BLAKE2B 05c61f59b02d3fa600143f96e3135e4f0d4e3b7b2bb22e83005120c095477018dac9fac4d6895a7e01ff06a24edcf40862236ba3202898637446239b8e79c5e1 SHA512 91532dc7048428097cfccfa7b0444ef39a00cdd859842ec01d20029bd5fcab4e8baf3eea0993b0a7f29acb8fd00c40f7c57a9db7d69ba619c0c41a28f10b83fb
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.2.ebuild b/app-editors/mousepad/mousepad-0.4.2.ebuild
index de411259d531..d2e953338abb 100644
--- a/app-editors/mousepad/mousepad-0.4.2.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.2.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 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dbus +gtk3"
 # D-Bus code fails to build against GTK+2
 # https://bugzilla.xfce.org/show_bug.cgi?id=15755
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index fb68edbe9db3..c88d869f9c2a 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,12 @@
-AUX nano-4.8-justify_keystroke_crash_fix.patch 1046 BLAKE2B adcbab5895d84e43c8682db0a5c01446f38c3c4dced4c12b191e6d0474557094e942bb1d1632241418b3b312c7cd79ee7afac81117115cb295786fbff8f62eaa SHA512 61be139d4b81b9d3032ed56d99649cf29a96ebfa0878ae50cf7633f3a6836d6efc7a0434da68cffe5d15c3871e47b210628b27ac634add9bef57db3c139ba6ea
-DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58 SHA512 76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
-DIST nano-4.9.2.tar.gz 2996106 BLAKE2B f3de611022f72de050f96b254a10fb9587014e4e239e34024d1941f9bd5d6abef17dbd1da95bba7cd328237137be1c79421ef7423cf40bab6a5577f9ae8ba587 SHA512 bbb43b63e03d104f168394c00778b5674249285c2400bb4664738a5badc7e5320b5a96f6b0275aa4e6f34f8127830564e87a8658442e358e5261116c595155b6
+AUX nano-4.9.3-disable-speller_build_fix.patch 10305 BLAKE2B 1a319fa63eadfa8c98b2f3f35df3cae631253606f6ac38fce96049a1078f13b5885dc368d725d09bbf7cd840c0766d446f757282693526f9fb723b05d1d6c4f4 SHA512 ceef1ba4ce7fc296785cd579bc645d9565d16b9adffbb6871684421823addbef87a70bfcd8f3f87bc7e48477ee0c56d3b326aaa9c019e0d04a7f000bc46076c2
+AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea070e66ea445c47259d48960cb96a7a4b63cf5b4ff2a8f0254573a57b78d194354af2a3d8b4ddb43a1af9f31a6fa12ea8628f1a SHA512 a4a1ddb4c1f1999251d499f8068ddc0e743e4499a1bf3781095c604ac08a1700f8648d30441c5aa6a2e96d75df262c77dec7f64bc29faa3b87ba8b664227614a
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
-EBUILD nano-4.6-r1.ebuild 2237 BLAKE2B db4fb753e8949f3049410ac0fb8d34239d1c1e05695a524aa65cb56bed024d81f7144c1bbb6474128a80fb07ea23943e804de96380053450949530554c6e4165 SHA512 de8b6e421684b4f11bd9e913e521bfbc1e6403751a9fa6af74c8ca6d90fbc2ef46d520939004a92c07a716fee66114bc244e8d862c91d823121791f36ee8eb8b
-EBUILD nano-4.9.2.ebuild 2176 BLAKE2B a904639e81b80ea3aa0bdfbf9b11abd81f9b84580e8ff1b763c47dbbcfa5d7742086336dd223b02127d1bc03265b9bacc974e091cf96e190e3ebd1c7dfdcc89d SHA512 f27889a95c6d7d0dbdf4caf41a17177236daea30b723aa0f8e122b802fef6b9806e745f337f0f6fada69abd288ba7dabdb57a57ea1433c30204938cb2aae632c
-EBUILD nano-4.9.3.ebuild 2176 BLAKE2B a904639e81b80ea3aa0bdfbf9b11abd81f9b84580e8ff1b763c47dbbcfa5d7742086336dd223b02127d1bc03265b9bacc974e091cf96e190e3ebd1c7dfdcc89d SHA512 f27889a95c6d7d0dbdf4caf41a17177236daea30b723aa0f8e122b802fef6b9806e745f337f0f6fada69abd288ba7dabdb57a57ea1433c30204938cb2aae632c
-EBUILD nano-9999.ebuild 2176 BLAKE2B a904639e81b80ea3aa0bdfbf9b11abd81f9b84580e8ff1b763c47dbbcfa5d7742086336dd223b02127d1bc03265b9bacc974e091cf96e190e3ebd1c7dfdcc89d SHA512 f27889a95c6d7d0dbdf4caf41a17177236daea30b723aa0f8e122b802fef6b9806e745f337f0f6fada69abd288ba7dabdb57a57ea1433c30204938cb2aae632c
+DIST nano-5.0.tar.gz 3034734 BLAKE2B 03ea59c97c0e421ed92f588a2e6991f968b2f341761db66fda077ab827d00b9eb13930f08011f0028010e2005bb912ead723928b482a0532e924f85757a75569 SHA512 7e650676a15a185a9695eb49ae5cf441e3d42ae13817a9d3e64cb347c795840712778ac464fd5c578cc6464132206ee06dba52a06a218bcc865485ce3502a4bb
+DIST nano-5.1.tar.gz 2861977 BLAKE2B c826782683d26b4c27ffb82e8c4dabad543fe93f53d942bc6ad57b8acb7959595986216a1936d69b0a63b72da101de2c886995421db93c76ee842313799de78d SHA512 8007f40f27a1235d59f5559b6629a3a5a1a579a2356c8825dfef121f4ba7e6c5196e4cedea441c7e856f9add1e9739b14b4142a0a14dab90841110218149df11
+DIST nano-5.2.tar.gz 2865091 BLAKE2B 3822b3fd8dede897d698401a06ea0b4b49bf39f48d16c750e273007b1795a8adfc71654eadc08039a5c6999973ff7e70148b4c720b32a8f361424404e3c2ff3f SHA512 4c77bcfdf704a7882e944cb6d4cd571b698447500255e5701d30990def56cec0c396a33c761b8149f3cc4208a8dcd0f39372804d54cbe6bc2db9244f4a2259b3
+EBUILD nano-4.9.3.ebuild 2334 BLAKE2B a46bb4bc1a3cb5d62c0f7db03c7ad1785d168daae307275b198e7f4527d98d84c7b7557ee1cfe2f70e4aa5e60f8cda4abb5fd8261decdcd4f7ff11f54f25e686 SHA512 a8dab8ae77a332ca5576b907e8a73fd288f3da0f8fdd4c2d52ab4e747c911c30425b81db7958a6b3a256ce4b1a2d6a480a728991e67b66d6d09434f36aaad1ef
+EBUILD nano-5.0-r1.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
+EBUILD nano-5.1.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
+EBUILD nano-5.2.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
+EBUILD nano-9999.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch b/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
deleted file mode 100644
index e18425a6b802..000000000000
--- a/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d05ce37c60a157760f386badc387e2d53b2fa75 Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Thu, 5 Mar 2020 16:57:16 +0100
-Subject: [PATCH] justify: do not crash when the user attempts to justify an
- empty region
-
-This fixes https://savannah.gnu.org/bugs/?57959.
-
-Bug existed since version 4.0, since the justifying
-of a marked region was introduced.
----
- src/text.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/text.c b/src/text.c
-index 957938f4..4fe7eb96 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -1930,6 +1930,12 @@ void do_justify(bool full_justify)
- 		get_region((const linestruct **)&first_par_line, &top_x,
- 					(const linestruct **)&last_par_line, &bot_x, &right_side_up);
- 
-+		/* When the marked region is empty, do nothing. */
-+		if (first_par_line == last_par_line && top_x == bot_x) {
-+			statusline(NOTICE, _("Nothing changed"));
-+			return;
-+		}
-+
- 		/* Save the starting point of the marked region. */
- 		was_top_lineno = first_par_line->lineno;
- 		was_top_x = top_x;
--- 
-2.25.2
-
diff --git a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
new file mode 100644
index 000000000000..978e24de805d
--- /dev/null
+++ b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
@@ -0,0 +1,342 @@
+From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Mon, 22 Jun 2020 08:39:59 +0200
+Subject: [PATCH] build: fix compilation when configured with
+ --disable-speller
+
+Move two functions that are used by the formatter too
+to between the proper #ifdef.
+
+Problem existed since commit 8089f5ad from a month ago.
+
+Backported to v4.9.3
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/text.c | 302 ++++++++++++++++++++++++++---------------------------
+ 1 file changed, 151 insertions(+), 151 deletions(-)
+
+diff --git a/src/text.c b/src/text.c
+index 93ad3704..c7690fd0 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -2011,8 +2011,159 @@ void construct_argument_list(char ***arguments, char *command, char *filename)
+ 	(*arguments)[count - 2] = filename;
+ 	(*arguments)[count - 1] = NULL;
+ }
++
++/* Open the specified file, and if that succeeds, remove the text of the marked
++ * region or of the entire buffer and read the file contents into its place. */
++bool replace_buffer(const char *filename, undo_type action, const char *operation)
++{
++	linestruct *was_cutbuffer = cutbuffer;
++	int descriptor;
++	FILE *stream;
++
++	descriptor = open_file(filename, FALSE, &stream);
++
++	if (descriptor < 0)
++		return FALSE;
++
++	cutbuffer = NULL;
++
++#ifndef NANO_TINY
++	add_undo(COUPLE_BEGIN, operation);
++
++	/* Cut either the marked region or the whole buffer. */
++	add_undo(action, NULL);
++#endif
++	do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
++#ifndef NANO_TINY
++	update_undo(action);
+ #endif
+ 
++	/* Discard what was cut. */
++	free_lines(cutbuffer);
++	cutbuffer = was_cutbuffer;
++
++	/* Insert the spell-checked file into the cleared area. */
++	read_file(stream, descriptor, filename, TRUE);
++
++#ifndef NANO_TINY
++	add_undo(COUPLE_END, operation);
++#endif
++	return TRUE;
++}
++
++/* Execute the given program, with the given temp file as last argument. */
++const char *treat(char *tempfile_name, char *theprogram, bool spelling)
++{
++	ssize_t lineno_save = openfile->current->lineno;
++	size_t current_x_save = openfile->current_x;
++	size_t pww_save = openfile->placewewant;
++	bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
++	struct stat fileinfo;
++	long timestamp_sec, timestamp_nsec;
++	static char **arguments = NULL;
++	pid_t thepid;
++	int program_status;
++	bool replaced = FALSE;
++
++	/* Get the timestamp and the size of the temporary file. */
++	stat(tempfile_name, &fileinfo);
++	timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
++	timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
++
++	/* If the number of bytes to check is zero, get out. */
++	if (fileinfo.st_size == 0)
++		return NULL;
++
++	/* Exit from curses mode to give the program control of the terminal. */
++	endwin();
++
++	construct_argument_list(&arguments, theprogram, tempfile_name);
++
++	/* Fork a child process and run the given program in it. */
++	if ((thepid = fork()) == 0) {
++		execvp(arguments[0], arguments);
++
++		/* Terminate the child if the program is not found. */
++		exit(9);
++	} else if (thepid < 0)
++		return _("Could not fork");
++
++	/* Block SIGWINCHes while waiting for the program to end,
++	 * so nano doesn't get pushed past the wait(). */
++	block_sigwinch(TRUE);
++	wait(&program_status);
++	block_sigwinch(FALSE);
++
++	/* Restore the terminal state and reenter curses mode. */
++	terminal_init();
++	doupdate();
++
++	if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
++		statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
++		return NULL;
++	} else if (WEXITSTATUS(program_status) != 0)
++		statusline(ALERT, _("Program '%s' complained"), arguments[0]);
++
++	/* Stat the temporary file again. */
++	stat(tempfile_name, &fileinfo);
++
++	/* When the temporary file wasn't touched, say so and leave. */
++	if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
++				(long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
++		statusbar(_("Nothing changed"));
++		return NULL;
++	}
++
++#ifndef NANO_TINY
++	/* Replace the marked text (or entire text) with the corrected text. */
++	if (spelling && openfile->mark) {
++		ssize_t was_mark_lineno = openfile->mark->lineno;
++		bool upright = mark_is_before_cursor();
++
++		replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
++
++		/* Adjust the end point of the marked region for any change in
++		 * length of the region's last line. */
++		if (upright)
++			current_x_save = openfile->current_x;
++		else
++			openfile->mark_x = openfile->current_x;
++
++		/* Restore the mark. */
++		openfile->mark = line_from_number(was_mark_lineno);
++	} else
++#endif
++	{
++		openfile->current = openfile->filetop;
++		openfile->current_x = 0;
++
++		replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
++					/* TRANSLATORS: The next two go with Undid/Redid messages. */
++					(spelling ? N_("spelling correction") : N_("formatting")));
++	}
++
++	/* Go back to the old position. */
++	goto_line_posx(lineno_save, current_x_save);
++	if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
++		openfile->current_x = strlen(openfile->current->data);
++
++#ifndef NANO_TINY
++	if (replaced)
++		update_undo(COUPLE_END);
++#endif
++
++	openfile->placewewant = pww_save;
++	adjust_viewport(STATIONARY);
++
++	if (spelling)
++		statusbar(_("Finished checking spelling"));
++	else
++		statusbar(_("Buffer has been processed"));
++
++	return NULL;
++}
++#endif /* ENABLE_SPELLER || ENABLE_COLOR */
++
+ #ifdef ENABLE_SPELLER
+ /* Let the user edit the misspelled word.  Return FALSE if the user cancels. */
+ bool fix_spello(const char *word)
+@@ -2307,157 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
+ 	return NULL;
+ }
+ 
+-/* Open the specified file, and if that succeeds, remove the text of the marked
+- * region or of the entire buffer and read the file contents into its place. */
+-bool replace_buffer(const char *filename, undo_type action, const char *operation)
+-{
+-	linestruct *was_cutbuffer = cutbuffer;
+-	int descriptor;
+-	FILE *stream;
+-
+-	descriptor = open_file(filename, FALSE, &stream);
+-
+-	if (descriptor < 0)
+-		return FALSE;
+-
+-	cutbuffer = NULL;
+-
+-#ifndef NANO_TINY
+-	add_undo(COUPLE_BEGIN, operation);
+-
+-	/* Cut either the marked region or the whole buffer. */
+-	add_undo(action, NULL);
+-#endif
+-	do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
+-#ifndef NANO_TINY
+-	update_undo(action);
+-#endif
+-
+-	/* Discard what was cut. */
+-	free_lines(cutbuffer);
+-	cutbuffer = was_cutbuffer;
+-
+-	/* Insert the spell-checked file into the cleared area. */
+-	read_file(stream, descriptor, filename, TRUE);
+-
+-#ifndef NANO_TINY
+-	add_undo(COUPLE_END, operation);
+-#endif
+-	return TRUE;
+-}
+-
+-/* Execute the given program, with the given temp file as last argument. */
+-const char *treat(char *tempfile_name, char *theprogram, bool spelling)
+-{
+-	ssize_t lineno_save = openfile->current->lineno;
+-	size_t current_x_save = openfile->current_x;
+-	size_t pww_save = openfile->placewewant;
+-	bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
+-	struct stat fileinfo;
+-	long timestamp_sec, timestamp_nsec;
+-	static char **arguments = NULL;
+-	pid_t thepid;
+-	int program_status;
+-	bool replaced = FALSE;
+-
+-	/* Get the timestamp and the size of the temporary file. */
+-	stat(tempfile_name, &fileinfo);
+-	timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
+-	timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
+-
+-	/* If the number of bytes to check is zero, get out. */
+-	if (fileinfo.st_size == 0)
+-		return NULL;
+-
+-	/* Exit from curses mode to give the program control of the terminal. */
+-	endwin();
+-
+-	construct_argument_list(&arguments, theprogram, tempfile_name);
+-
+-	/* Fork a child process and run the given program in it. */
+-	if ((thepid = fork()) == 0) {
+-		execvp(arguments[0], arguments);
+-
+-		/* Terminate the child if the program is not found. */
+-		exit(9);
+-	} else if (thepid < 0)
+-		return _("Could not fork");
+-
+-	/* Block SIGWINCHes while waiting for the program to end,
+-	 * so nano doesn't get pushed past the wait(). */
+-	block_sigwinch(TRUE);
+-	wait(&program_status);
+-	block_sigwinch(FALSE);
+-
+-	/* Restore the terminal state and reenter curses mode. */
+-	terminal_init();
+-	doupdate();
+-
+-	if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
+-		statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
+-		return NULL;
+-	} else if (WEXITSTATUS(program_status) != 0)
+-		statusline(ALERT, _("Program '%s' complained"), arguments[0]);
+-
+-	/* Stat the temporary file again. */
+-	stat(tempfile_name, &fileinfo);
+-
+-	/* When the temporary file wasn't touched, say so and leave. */
+-	if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
+-				(long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
+-		statusbar(_("Nothing changed"));
+-		return NULL;
+-	}
+-
+-#ifndef NANO_TINY
+-	/* Replace the marked text (or entire text) with the corrected text. */
+-	if (spelling && openfile->mark) {
+-		ssize_t was_mark_lineno = openfile->mark->lineno;
+-		bool upright = mark_is_before_cursor();
+-
+-		replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
+-
+-		/* Adjust the end point of the marked region for any change in
+-		 * length of the region's last line. */
+-		if (upright)
+-			current_x_save = openfile->current_x;
+-		else
+-			openfile->mark_x = openfile->current_x;
+-
+-		/* Restore the mark. */
+-		openfile->mark = line_from_number(was_mark_lineno);
+-	} else
+-#endif
+-	{
+-		openfile->current = openfile->filetop;
+-		openfile->current_x = 0;
+-
+-		replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
+-					/* TRANSLATORS: The next two go with Undid/Redid messages. */
+-					(spelling ? N_("spelling correction") : N_("formatting")));
+-	}
+-
+-	/* Go back to the old position. */
+-	goto_line_posx(lineno_save, current_x_save);
+-	if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
+-		openfile->current_x = strlen(openfile->current->data);
+-
+-#ifndef NANO_TINY
+-	if (replaced)
+-		update_undo(COUPLE_END);
+-#endif
+-
+-	openfile->placewewant = pww_save;
+-	adjust_viewport(STATIONARY);
+-
+-	if (spelling)
+-		statusbar(_("Finished checking spelling"));
+-	else
+-		statusbar(_("Buffer has been processed"));
+-
+-	return NULL;
+-}
+-
+ /* Spell check the current file.  If an alternate spell checker is
+  * specified, use it.  Otherwise, use the internal spell checker. */
+ void do_spell(void)
+-- 
+2.28.0
+
diff --git a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
new file mode 100644
index 000000000000..52112bab7235
--- /dev/null
+++ b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
@@ -0,0 +1,46 @@
+From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Mon, 22 Jun 2020 14:00:23 +0200
+Subject: [PATCH] build: fix compilation for --enable-tiny --enable-color
+ --enable-nanorc
+
+Backported to v4.9.3
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/nano.c | 2 +-
+ src/text.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index be80a073..3ac81ba4 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -1079,7 +1079,7 @@ RETSIGTYPE do_continue(int signal)
+ 	ungetch(KEY_FLUSH);
+ }
+ 
+-#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
++#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)
+ /* Block or unblock the SIGWINCH signal, depending on the blockit parameter. */
+ void block_sigwinch(bool blockit)
+ {
+diff --git a/src/text.c b/src/text.c
+index c7690fd0..32727946 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -2032,10 +2032,10 @@ bool replace_buffer(const char *filename, undo_type action, const char *operatio
+ 
+ 	/* Cut either the marked region or the whole buffer. */
+ 	add_undo(action, NULL);
+-#endif
+ 	do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
+-#ifndef NANO_TINY
+ 	update_undo(action);
++#else
++	do_snip(FALSE, TRUE, FALSE, FALSE);
+ #endif
+ 
+ 	/* Discard what was cut. */
+-- 
+2.28.0
+
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index e27dda0e78d7..5e77b11f1a70 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -32,6 +32,14 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
+
+REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-speller_build_fix.patch"
+	"${FILESDIR}/${P}-minimal_build_fix.patch" #734856
+)
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-editors/nano/nano-4.9.2.ebuild b/app-editors/nano/nano-5.0-r1.ebuild
index e27dda0e78d7..86f22534c12f 100644
--- a/app-editors/nano/nano-4.9.2.ebuild
+++ b/app-editors/nano/nano-5.0-r1.ebuild
@@ -32,6 +32,9 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
+
+REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
@@ -74,6 +77,12 @@ src_install() {
 		sed -i \
 			-e '/^# include /s:# *::' \
 			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
 	fi
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
diff --git a/app-editors/nano/nano-4.6-r1.ebuild b/app-editors/nano/nano-5.1.ebuild
index 28d67f86b940..86f22534c12f 100644
--- a/app-editors/nano/nano-4.6-r1.ebuild
+++ b/app-editors/nano/nano-5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -32,7 +32,9 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
-PATCHES=( "${FILESDIR}/${PN}-4.8-justify_keystroke_crash_fix.patch" )
+
+REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
@@ -75,6 +77,12 @@ src_install() {
 		sed -i \
 			-e '/^# include /s:# *::' \
 			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
 	fi
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
diff --git a/app-editors/nano/nano-5.2.ebuild b/app-editors/nano/nano-5.2.ebuild
new file mode 100644
index 000000000000..86f22534c12f
--- /dev/null
+++ b/app-editors/nano/nano-5.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+		$(usex ncurses --without-slang $(use_with slang))
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index e27dda0e78d7..86f22534c12f 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -32,6 +32,9 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
+
+REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
@@ -74,6 +77,12 @@ src_install() {
 		sed -i \
 			-e '/^# include /s:# *::' \
 			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
 	fi
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index eaee2f36a013..5660dc822763 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,3 +1,5 @@
 DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
+DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919
 EBUILD ne-3.1.1.ebuild 1118 BLAKE2B 3cdcb4ccaa8df16f2841f1ffd058c57818eea93239993d2815de93ebaca959edd85e540915164373b6756ba59ffae9413ab6ab3fea442ab48dd1b795e99a9d10 SHA512 145bc2a8931119a6b5cc6604db38a7ca027eb00d3363831d187178e7a40e8bee3174291aa864422b97f1c0924dff05037ea6d44eb5ca1159895aacddf40f437f
+EBUILD ne-3.3.0.ebuild 1014 BLAKE2B d7af8d7b8457d5784417427c121c4798f1721953d614cfe53fb7bf819ceb731ff5807ed28eadfcb4fc91f23c800a521f3ef1be2f4a891df72e5f364e844e738a SHA512 125fa01b674e4d39c460fdf53d49a1b7833f80a927650fe7d6a1e028d8170dddcfde4f1d518dd2fa568cf8137e4bbd378e2578266e9452f9df5bf38417cc5f07
 MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.0.ebuild
new file mode 100644
index 000000000000..f90eeb484b77
--- /dev/null
+++ b/app-editors/ne/ne-3.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
+HOMEPAGE="http://ne.di.unimi.it/"
+SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0=[tinfo]"
+
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+"
+
+HTML_DOCS=( doc/html/. )
+
+src_prepare() {
+	default
+	#sed -i -e 's/-O3//' src/makefile || die
+	sed -i -e "s|-lcurses|-ltinfo|g" src/makefile || die
+}
+
+src_compile() {
+	append-cflags -std=c11
+	emake -C src CC="$(tc-getCC)" \
+		NE_GLOBAL_DIR="/usr/share/${PN}" \
+		OPTS="${CFLAGS}" \
+		"${PN}"
+}
+
+src_install() {
+	dobin "src/${PN}"
+
+	insinto "/usr/share/${PN}/syntax"
+	doins syntax/*.jsf
+
+	doman "doc/${PN}.1"
+	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 609a8bc70082..94814e9d7b8f 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 1837 BLAKE2B c044e3eddc1a7c9bcb5f1d8ed804a0def40a84c0d6cb4175f4a6f41f44e16d8b2aff35452ceee322c444326fb9b923d4110a00bece8fe24abd422e7e24748f98 SHA512 9ee9af220071426b9977b9a49f433b62e8aca089d989c659cc27b13b3344e278303017c74c4cf391a117a7da4bfc09c4caedc55bd90ec3b6d29d540a0529acc5
+EBUILD neovim-0.4.3.ebuild 1844 BLAKE2B c1e1b79f035640c5a29c875494069810d7c6397fd9e76d13e66b5d4c25623fe065afbc39402c534e623a5739e7e49b8405ac57568b0790eff0bee015022f0461 SHA512 65a4b5df7e9d47030ff58fb4a915a77c39f161c74c139ac1ee21c4e886c38f17c42462352b36210b66c931e59e4841ba8863726446fb51d065ba57e7c4e6cc6b
 EBUILD neovim-9999.ebuild 1861 BLAKE2B 7eb5a5509a102b044cb69b056965b31a92e92aa04adb4b506102f19a7175fe654f498ddc1904805e99c0abc161aeda6c3a420dd5fe4576c95db1723c393fe24d SHA512 c6d6f456c6ee4ac41970e635e90d95eb32866f2a463b729f2624dadca7b727ced783e0081af0140c5b9fcf6e6b510adfb70551bae639f0831e35894730568ff1
 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 7891fa27662b..4b797548ec12 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index fa67bdfaadfe..7d898884d5db 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,4 +1,4 @@
 DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061
-EBUILD notepadqq-2.0.0_beta.ebuild 1042 BLAKE2B 8d3ea345c3a4d3c9ca34bfff72a2549e0a1ecc0df102e64e2bb6e3bce77661e877ba2ba5e3e1168f1225433a8eb92b9e97107c072782c3810aa6dd0c3e14da8c SHA512 3faf879c48ca8375a344e8fa14edf980aba4bdc49e3c38130feb00ce8fc37947c107ebb38221cbae3ad8ab2e72bb4bc790e88019d93fb591283eeb9df15aa2dc
-EBUILD notepadqq-9999.ebuild 1042 BLAKE2B 8d3ea345c3a4d3c9ca34bfff72a2549e0a1ecc0df102e64e2bb6e3bce77661e877ba2ba5e3e1168f1225433a8eb92b9e97107c072782c3810aa6dd0c3e14da8c SHA512 3faf879c48ca8375a344e8fa14edf980aba4bdc49e3c38130feb00ce8fc37947c107ebb38221cbae3ad8ab2e72bb4bc790e88019d93fb591283eeb9df15aa2dc
+EBUILD notepadqq-2.0.0_beta.ebuild 1035 BLAKE2B b6634b1b60db0995b920059b9a4f0802e294f3da7aee2acd03341d303cd08206f9b705642af135378ce4137eeb93f120b632e3e309f9973d5385ea01b9cc946a SHA512 29396a26e43a79aa9f4a96a9b16e1ebcb9d12dcb8f5f314d0dcf30a5da6474f6bd70fdab5d98ff8f2548e5134296505041c6efe9297d0b9176417b3f6233f08c
+EBUILD notepadqq-9999.ebuild 1035 BLAKE2B b6634b1b60db0995b920059b9a4f0802e294f3da7aee2acd03341d303cd08206f9b705642af135378ce4137eeb93f120b632e3e309f9973d5385ea01b9cc946a SHA512 29396a26e43a79aa9f4a96a9b16e1ebcb9d12dcb8f5f314d0dcf30a5da6474f6bd70fdab5d98ff8f2548e5134296505041c6efe9297d0b9176417b3f6233f08c
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
index 2da7d1d0936a..55064b0e2564 100644
--- a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
+++ b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit qmake-utils xdg
 
 DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
+HOMEPAGE="https://notepadqq.com/s/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 2da7d1d0936a..55064b0e2564 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit qmake-utils xdg
 
 DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
+HOMEPAGE="https://notepadqq.com/s/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 0ba998d468ce..de503beec17f 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.4.ebuild b/app-editors/okteta/okteta-0.26.4.ebuild
new file mode 100644
index 000000000000..4f2ba889d3b3
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.4.ebuild
@@ -0,0 +1,70 @@
+# 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/pluma/Manifest b/app-editors/pluma/Manifest
index 82f21ca0b64a..abbd87f40025 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.22.2.tar.xz 3262288 BLAKE2B 0a7af4318ec11aa6a01dd14ed071975b6a961747c1abda9120912244f3fd530c5c06e2fc9dad6ad23175c119e35c1380e88be4b9bc1e331485b646dee87af8e1 SHA512 a68b79713f649def15ea29e58e041d70bb6d756a356743f6e06d8dd680f7b39e8bcdd90c68cbe5c517bead7f9263d7596954bc595c3a2501edf0d0ea421c9992
 DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
 EBUILD pluma-1.22.2.ebuild 1763 BLAKE2B fdaa40798715c30416e583d6ce689f2c16694f5d3ea74a9da722680f44ff2f6a8cb5d037b316617a58b4758ffc70c091acf621735471312f3b2c8034f4f807a0 SHA512 9966f165a8a795a5bc0f79d9c8092a4189a21955ebe958d4e07eb24be0ef7307dc3e3da1ccb89483af7abeab63dd697767031423eef98d35006d6b43151883b7
-EBUILD pluma-1.24.0.ebuild 1782 BLAKE2B 5338be90c3f64ec38bd7deaa99a813269dba08104c5577a96560e170a3402df4de0d85b6ddddeb0f223a4390b519b90696dc2eedd019c329e30618efc52dc4a3 SHA512 026999eb91c75206fdcef88ba1b3844278b5519ac3c3b957effb23e2b7506b27ec6d0040e5018493aa4f176ac57ccad139ce18d75336b8bdefc837a47b357eec
+EBUILD pluma-1.24.0.ebuild 1780 BLAKE2B d845bbd202c228b0b8f11c1a74b6791081fabe9fdfe80e08e4e62b40e3e3e27b626caa9263f906b7c4eb9ad056412b0f18305a4a107d85ec14d7a39149d73e77 SHA512 1f81f212c6ad19b923e4f8a8aa5b935bb4ca05bba3059553583ecb178bc65bc562e939f690033d62e4737ba76e0d5b008076649dbabb06e87f632120fdfaabe2
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
index ae1a569e5bee..31c1ba51542a 100644
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ b/app-editors/pluma/pluma-1.24.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit mate python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
new file mode 100644
index 000000000000..59cde71f0e8d
--- /dev/null
+++ b/app-editors/pyvim/Manifest
@@ -0,0 +1,3 @@
+DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
+EBUILD pyvim-3.0.2.ebuild 843 BLAKE2B 797269dcef0f96efc18709ee4d7e6e0c5a95eab904022c6b9ea348460574c134678c6afba1bc00f9c1915c6839c064ce84d5b5d5859212bf8a0b70974c2fe35d SHA512 b5e388b2e74d78fffe5f7414f6d2608ab6b0a0ef6d001dbf918c41b055938b9878e3940e92a8686beafb2945e5bfe76d7b98a6bf120cb166166c54399d9b90bf
+MISC metadata.xml 489 BLAKE2B c68a02d61b1c1e6f577c4fa415ce88e93cb4fad16418800dbdb5121baba72f521f18c1d253089835b7b99ff94e6f095051974dfadc5c55b6dc33a52ac6b25b58 SHA512 8ad8692c0a2e47b5135497d49c4a5676607e429a5281b7bfc3f9f0ba6e77195020218f1a444cfd587deee7a7cd2cd6f56ff28d66392f14b5b48203097b08680a
diff --git a/app-editors/pyvim/metadata.xml b/app-editors/pyvim/metadata.xml
new file mode 100644
index 000000000000..318dcc191ea8
--- /dev/null
+++ b/app-editors/pyvim/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyvim</remote-id>
+		<remote-id type="github">prompt-toolkit/pyvim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild
new file mode 100644
index 000000000000..f0ba40a9fbc0
--- /dev/null
+++ b/app-editors/pyvim/pyvim-3.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of Vim in Python"
+HOMEPAGE="https://pypi.org/project/pyvim https://github.com/prompt-toolkit/pyvim"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-eselect/eselect-vi
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/prompt_toolkit[${PYTHON_USEDEP}]"
+
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+pkg_postinst() {
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	eselect_vi_update
+}
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 773e57e4db73..d0f0ef660ed6 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,4 +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-9999.ebuild 1848 BLAKE2B 4a75d45db8f9b49a6d51c65948977f3131f5cc835eb98a38bf348f116e1097a25e7afcbeaa38d63a1fbcefdb06ca46f0f11cfe87d666a82a1643d61e7f760f34 SHA512 a362639fbecd506f815f01fc39d299f99810b3d1c7b66017e89c20b4ebbf868fc8a8583b16cb17fceb84006180e2d214bccb13e74532332e563e1057c6513e4f
+EBUILD retext-7.1.0.ebuild 1815 BLAKE2B 6e11140eb671436bbe5c429fbff1b8979e77935abffcacaf48e2fff7f334ec0c1448d71b32a1daeb271de31ddd88759513ed3a92896da775a1ad49f9f114625a SHA512 7eb528818d824fda30c86fef2760c1ab90310805cffa5bb4e5b3ca68b4bd80b9a504eaeb88ef2d54018be9d41866b90df44cc33cf0b3a6c1d29a672315baeddc
+EBUILD retext-9999.ebuild 1808 BLAKE2B c4c846679a9a6dee6388122fabcabab56309bc0f03a9d7cf9959c4f09758ae201dda44a2c8f0eb73139d2c26aeb265879016760c39fba444b1be94e751f6528a SHA512 e0a004901fd67abfb52e988d081016b91b4f0baa2a1e8c4116f90e3afe8bc1ea65ec63a4e0d026df162b0ddbf3a63032564b27890d4f6ab252b2e463484e67fc
 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
new file mode 100644
index 000000000000..482db4845ce4
--- /dev/null
+++ b/app-editors/retext/retext-7.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# no pypy{,3} support as PyQt5 does not support it at 2020-07-05 (towelday)
+# https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 eutils virtualx xdg-utils
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+
+if [[ ${PV} == *9999 ]]
+	then
+		inherit git-r3
+		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"
+		S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	optfeature "dictionary support" dev-python/pyenchant
+
+	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+	einfo "For more details take a look at:"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 44d48af58513..72e36651206d 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-# no pypy{,3} support as PyQt5 does not support it at 2019-05-15
+# no pypy{,3} support as PyQt5 does not support it at 2020-07-05 (towelday)
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1 virtualx xdg-utils
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -27,7 +28,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+spell"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -37,18 +38,9 @@ RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/python-markdown-math[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}]
-	|| (
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		<dev-python/PyQt5-5.12[webengine]
-		)
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 "
+DEPEND="${RDEPEND}"
 
 src_test() {
 	virtx distutils-r1_src_test
@@ -62,6 +54,8 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 
+	optfeature "dictionary support" dev-python/pyenchant
+
 	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
 	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
 	einfo "For more details take a look at:"
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index bd6e7567b233..68e971a87d8d 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,11 +1,7 @@
-DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
-DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
-DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
 DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
-EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
-EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
-EBUILD scite-4.2.1.ebuild 2940 BLAKE2B 17e953bc8efaf403ad7d00beff04386dd3f9b8204fb243eddb243d696b4d39b07a7d351271e6ca3aad641154e35a98b2256f34543770290c3e39ce1716397144 SHA512 e0cf697468ce209fc8552f702196e689045fb2af46f41957444338be50b4f9840dd03ebfc0285710a6f81f3ecafdc137bf74b745d10719ee5ae49a8b6f9d4440
-EBUILD scite-4.3.2.ebuild 2824 BLAKE2B bf682868c83293e9af524157bdac3fdf585a604ae9bc250e5af7befc905c5a84392f919a08893bfc26b5eacbb2fb4d925fd9ce8d430d8b80c85ac6049d7f37f4 SHA512 7e94a32030d4bf858288906901dadff3c533faa42e8f8e6c1823f560f8d1cacfff44f5b4abfd9346b8221691bc62e81b69b0a8379b1247218d7febb187568c35
-EBUILD scite-4.3.3.ebuild 2824 BLAKE2B bf682868c83293e9af524157bdac3fdf585a604ae9bc250e5af7befc905c5a84392f919a08893bfc26b5eacbb2fb4d925fd9ce8d430d8b80c85ac6049d7f37f4 SHA512 7e94a32030d4bf858288906901dadff3c533faa42e8f8e6c1823f560f8d1cacfff44f5b4abfd9346b8221691bc62e81b69b0a8379b1247218d7febb187568c35
+DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
+EBUILD scite-4.2.1.ebuild 2972 BLAKE2B 670cbed1ba766c7bbd3aae02dffd4eb6e78491b85f49f5353f3de5173717b4a9386e36d26e4a32a6db05938b9e7ea572b466753c24efdd50b172c57ec5dc02b8 SHA512 8f91f1ccd3ab9fc6ee30c6811a64b30c93f2b7a4b2feb1d2d192b2178ea2aba3b41d6d90a3380276302d117a414c7f13e0478ad919b5c2d74398cb82dab406ab
+EBUILD scite-4.3.3.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
+EBUILD scite-4.4.4.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.1.3.ebuild b/app-editors/scite/scite-4.1.3.ebuild
deleted file mode 100644
index 01cbf1b36376..000000000000
--- a/app-editors/scite/scite-4.1.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils toolchain-funcs xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
-	dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3=
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
-src_prepare() {
-	# remove hardcoded CC, Optimizations and clang unknown flags
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CC = gcc#CC = ${CC}#" \
-		-e "s#^CC = clang#CC = ${CC}#" \
-		-e "s#^CXX = clang++#CC = ${CXX}#" \
-		-e "s#-Os##" \
-		-e "s#-Wno-misleading-indentation##" \
-		|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-		-e "s#^CC = clang#CC = ${CC}#" \
-		-e "s#^CXX = clang++#CC = ${CXX}#" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		-e "s#-Os##" \
-		|| die "error patching gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching /scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-		|| die "error patching /scite/src/perl.prperties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars="GTK3=1"
-
-	if tc-is-clang ; then
-		emake_pars+=" CLANG=1"
-	fi
-
-	if ! use lua; then
-		emake_pars+=" NO_LUA=1"
-	fi
-
-	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
-	emake "${emake_pars}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.2.0.ebuild b/app-editors/scite/scite-4.2.0.ebuild
deleted file mode 100644
index fecd4f286206..000000000000
--- a/app-editors/scite/scite-4.2.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils toolchain-funcs xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
-	dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3=
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
-src_prepare() {
-	# remove hardcoded CC, Optimizations and clang unknown flags
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CC = gcc#CC = ${CC}#" \
-		-e "s#^CC = clang#CC = ${CC}#" \
-		-e "s#^CXX = clang++#CC = ${CXX}#" \
-		-e "s#-Os##" \
-		-e "s#-Wno-misleading-indentation##" \
-		|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-		-e "s#^CC = clang#CC = ${CC}#" \
-		-e "s#^CXX = clang++#CC = ${CXX}#" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		-e "s#-Os##" \
-		|| die "error patching gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching /scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-		|| die "error patching /scite/src/perl.prperties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars="GTK3=1"
-
-	if tc-is-clang ; then
-		emake_pars+=" CLANG=1"
-	fi
-
-	if ! use lua; then
-		emake_pars+=" NO_LUA=1"
-	fi
-
-	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
-	emake "${emake_pars}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index 6b9aa913c832..648761d8d38b 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -47,18 +47,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@@ -72,7 +74,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
index 186e3d50d591..9878fd6a6b64 100644
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -50,18 +50,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@@ -75,7 +77,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
diff --git a/app-editors/scite/scite-4.3.2.ebuild b/app-editors/scite/scite-4.4.4.ebuild
index 186e3d50d591..9878fd6a6b64 100644
--- a/app-editors/scite/scite-4.3.2.ebuild
+++ b/app-editors/scite/scite-4.4.4.ebuild
@@ -50,18 +50,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@@ -75,7 +77,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 722f381468fe..3b9f4bd96171 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 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
+EBUILD vim-8.2.0814.ebuild 9041 BLAKE2B 284edc7c7a8fe6b4e5e0ffaa39e36cdbebf1534eddd223c7a03e8136fb29ca14b5549a6282c1a3dd0b21df8abbef409ed07b16c33c342185a55aebe5e574ddaa SHA512 899f16275ed449611f6c212098a45db0b92ee3c06f3a96ae899a041a9a3668529dbaa07f7037d05469a06c47ee6d90d2d454c82e97ff9fc03bd7b6cea8839bf3
 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 5bc04c0d2b05..f077cf006b4c 100644
--- a/app-editors/vim/vim-8.2.0814.ebuild
+++ b/app-editors/vim/vim-8.2.0814.ebuild
@@ -204,7 +204,7 @@ src_configure() {
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
 			$(use_enable python python3interp)
-			$(use_with python python3-command $(type -P $(eselect python show --python3)))
+			$(use_with python python3-command "${PYTHON}")
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index f03ab8673f2d..619b83c0e480 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,5 +1,8 @@
 DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
+DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d45c2f75eb954feed49d1ebeb1ee2cb31675cf68b356a0d32bcc33454aa2fbf0fd5c77afeea0a73465cd SHA512 3809b40f75816e03e47e0c2c16d2681cc1c01ad50a3d051285d5f1e9ff0a333160e668228a129a1596109aa079dc8364d3ad060b88e9dba33bb1d60a15eaf4e2
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
+DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-9999.ebuild 1330 BLAKE2B f23e11f2c52c94a7c5211ab6640cc33562874f19c1d0a5a50582c02b49d952f84d98fd7770fe0fa7233678dc1cf896aab920c5410743179d4ed69f5504fa2960 SHA512 fd91bfcc4c52091e91f620f29fe048fc0b277338a318ccaca4b1a45f1a960252f10a85493eb24d41238d9791608519ea7c9f2ef27e9623b5ad9a02f0122d426c
+EBUILD vis-0.6.ebuild 1696 BLAKE2B 651e46d6a9f8c2ba06b337dbdef90a796b8095f77a94baab2c1b9bd3b706223bb6abbab2e74eaeea791c2e4b12a86952a7ca19c3e6a31e1000ee0dac17a8e336 SHA512 ab68ff1949715e39a7df18a729b16b4dbad829ed94cd3ef6a787039b065dddca47de1c4175c83994d47fcdbe450feb6f1e1be6924fcf9b864aa1236a77471906
+EBUILD vis-9999.ebuild 1271 BLAKE2B 7cc5f74cdd5322bcfa8458bb4e2820466f54ffa1631a636925d79ab1b0568079434e31307df6f6251801b4fee7686b185b9aa5f30c45855eeda3d4c47fb34c66 SHA512 e0196ba4a01430415e6ec3cd0b6daa430486b7c5b2a9cfffc7bc99baa953e3f6465175a0fd2eeeb00ae46f6c70b3222e45537a1a05e314661e53e455406189a7
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild
new file mode 100644
index 000000000000..7a2ce6eaaa69
--- /dev/null
+++ b/app-editors/vis/vis-0.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PTV=0.4
+
+DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
+HOMEPAGE="https://github.com/martanne/vis"
+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"
+IUSE="+ncurses selinux test tre"
+RESTRICT="!test? ( test )"
+
+# - Known to also work with NetBSD curses
+# - ::lua package done for using >=dev-lang/lua-5.2
+# which is needed for syntax highlighting and settings but masked in ::gentoo
+DEPEND="dev-libs/libtermkey
+	ncurses? ( sys-libs/ncurses:0= )
+	tre? ( dev-libs/tre:= )"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-vi"
+
+src_prepare() {
+	if use test; then
+		rm -r test || die
+		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+
+		# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
+		sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
+	fi
+
+	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+	default
+}
+
+src_configure() {
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable ncurses curses) \
+		$(use_enable selinux) \
+		$(use_enable tre) || die
+}
+
+update_symlinks() {
+	einfo "Calling eselect vi update --if-unset"
+	eselect vi update --if-unset
+}
+
+pkg_postrm() {
+	update_symlinks
+}
+
+pkg_postinst() {
+	update_symlinks
+}
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 72ff783c8404..600b5efb0576 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
@@ -13,8 +13,9 @@ KEYWORDS=""
 IUSE="+ncurses selinux test tre"
 RESTRICT="!test? ( test )"
 
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
+# - Known to also work with NetBSD curses
+# - ::lua package done for using >=dev-lang/lua-5.2
+# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
@@ -22,10 +23,6 @@ RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
 src_prepare() {
-	if use test && ! type -P vim &>/dev/null; then
-		sed -i 's/.*vim.*//' "${S}/test/Makefile" || die
-	fi
-
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
 	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
 	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 20b3481e5cc6..5318d8dfa860 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -14,7 +14,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 7085 BLAKE2B 1e799def26063041aa0b65cb96f9f22a33d87370d26a6ab7faa311862a9a653de8fdf2b446355489bcb8733c746cbbe16fc047a72036edba16b389625a07c299 SHA512 2217a71aead967aafc089089a95bf638fe13ad5293939de35ed0feac6b655ca73a9efc90aebf555e65bb59e4aa12e9ddae08a3dfaf26414ac39c784a5e27761d
+EBUILD xemacs-21.4.24-r2.ebuild 7081 BLAKE2B 4de65ac9ce0b9a0fbd71c955c75466eac766572ce7690c9db54a3d87a7f2878c318b17a353f3fce87d27a9a6553c1d59395c980782fdfb7e6a4a01a66533b328 SHA512 65b6a1d677ac7cf00137b3f1dfb96b226e928eab99f1865751e426c096d399a3afb8467640f573831a7fce79d81b41fbf688801df04ebce6289904f4d8a95fd7
 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 7347 BLAKE2B 37cbdbddeb0f4609c714970f17f5ec5b32e32acb6191be0e7625ece1bef06266cf4621024aeab1f1d1b0f0443ebb0aeeab8fc7c2680eb41dad4862ab2a35dbaf SHA512 b68abd3d69128022037db816b1fa03241238579bf9086263724687a717138a8599f9cd997c9fc93b3e5f039e3d5a944769c47cba8284af6ca4f403450b192e5b
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 1f2018514edc..1276e477e5f5 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"
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-editors
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)