gentoo Easter resync : 12.04.2020

101 files changed, 1254 insertions, 4048 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 20da6a442f6b..386664073f13 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 451b03fd397c..fe4e90b6f560 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,16 +7,16 @@ DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259a
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 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.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
-EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
-EBUILD emacs-23.4-r18.ebuild 10995 BLAKE2B a4d361a3679c26bf66c60745c30e9ea99565dc39bdc1f78238b268370483d4bc8d11660c91a0d9448029e1c3571b2a8b9ecc9a486659759d1234ba0e4a051eea SHA512 defcc3e6cc3d27e93c2e34a7ae992e6d6e3c0379f57e026a417270b3dede4170cf70708de3b9a593c1eb009064df7b24e01b374d10f09a23e362b60b0d0ac726
-EBUILD emacs-24.5-r7.ebuild 10782 BLAKE2B 69571f470ab16abbabd92a4c8ed8af1c623eb239e18687ed2bb59bbb98df7bf692b7431088c8edd06efe1f92342a07f2481b80bb7cdbd8499c4ee2804f6d4eed SHA512 87cb62aa9abdeb27bde6e9a8ae267f9f628531bb22c32ab99354cb96d5ab84b734e7e013368be8a3817388002cad8ba3656f8d7c5c0de8b3203e1439befeaa5a
-EBUILD emacs-25.3-r6.ebuild 11140 BLAKE2B fae5e567fe738483c344fce515644d3641e1609d8e83a4d386208efb77b87e30081fbb0546f02e9cde9ee159a740ab9b07422dbb923c8005e41860262b2c9e3d SHA512 56899ea0385efa2d6c6f1eadb482819b9e5f28a5841f4e030d25ff86574062fa71c3ab54ec9ef2da7d273ac1d5d92f5bc5a4d16b6da385d297161c60c748dbb6
-EBUILD emacs-26.2.ebuild 11644 BLAKE2B 42874bb834954b89a2a4ff8a796a6d0bc233679d8ec504d876867d89029d02d108e4957cb870ccbeb50edb7814998ab6d5ae2d19e4aaa453f3adf6c5a4ba6f8b SHA512 4530ff4613deb6e71accbfbdf490c36efca62f2e1978dfea6a6d5b19b6c73bd70c213eb808dfe91ab0dfe941e3994206ca73f6925322f7e2f1f93abedc147cd9
-EBUILD emacs-26.3-r1.ebuild 11928 BLAKE2B 5012d1c63aca7f56250e9c1cb24761e0a5b87c2f0dbc3152640e40593abfc97a3a85620cb71b7e83af94a71c257f9586a2d61b620b5de2c03a2203d3ad5577e5 SHA512 f9d916d79bc35db9ec0631486889b1058105d3eea741dcf8e8b0a9b9f2b3a0fa35a6b6e587e9d585edb6d89b33fd5c79069a1467b3f0798f257a0342da53d3f7
-EBUILD emacs-27.0.50_pre20191223.ebuild 12940 BLAKE2B c3addd2d837176730fa9af6fc9ed61d030e94270b57d9088cd49a2a5f1215fdb04222c0568e1c7795b79c2d048ec6e140d96b74d17ce108430ab34d1f909ce78 SHA512 cdab47cf5d607c88ef7b7bfa745792198704d44470a40a0397079ad0302218c5d22742827f0bf5bac658dc63e7c9e30272e896f596b931ddcab3db483815370a
-EBUILD emacs-27.0.9999-r1.ebuild 12942 BLAKE2B 34c66399fa9f18eb37ad7cbeb9e708879e5900e1b7fdcc42bbec869f24542958f033ec0244562af861624d3870d5bc8c70316e025acd79b38a7594859245daed SHA512 5a7eb8009a99380461c1adcba78384b431e98269f1c60bb1b27e141a3ccd6e30ac430f0b6539f7670143a783f4b850564e72fff4b0ec6d6affdd729c73945544
-EBUILD emacs-28.0.9999.ebuild 12891 BLAKE2B f3046e6b14b4380300229810e00f6452675a03e96947a2b0375587cbd103091e874727a78ee18493c7031ce9a7c38e2fdad59db569a251314a75295b97b2fbff SHA512 376e542117c6a7ee4b9c2764e836a3378f0631a4a2a18020c3a737f957cbdf2b1c7571681419eb95cf8e1cc7b524ca420ad8c9d8fb0acbf96d4823442e57f276
+DIST emacs-27.0.90.tar.xz 43706980 BLAKE2B 87f9b621305711d7083307fbf921a32e7a878c6eef7939100511f669fdf052d88d8aea3c46a2c9fb9e9383c47c4066ec580443b2b24e510a6894d59caf9825ec SHA512 1a6f319e964f20ad35574eb2d2e18ae8c86d9d2ab9ae038334f0f468c40602d1f9b20880cfa704ea2067bdd7a3952ea3e6b565d5bb3d6d304922ad1d98c1c76b
+EBUILD emacs-18.59-r12.ebuild 4461 BLAKE2B 894572f7e472d2f79ffa2baef17602763072c0b4fe20e511208a346dbe8a655e6674be680c96a96a9d1312d84eaed8647d8c194037c990869c954f5791ac4f30 SHA512 c5b153cc299fdb5568301794aea6943cd39be2a7b3dafa5d39c8d3debd6a3a48279592b9bd116f8079335105e691b52a3dfe10f94f8777b4a404af4678088d1a
+EBUILD emacs-23.4-r18.ebuild 11035 BLAKE2B c88cf75a853e0ef158a1382fe082178fa5e052613e4729dfffb1f8e81926da07975051041b5fc59a5ab96349b9c675e0f1fbaaca74e1fff16524a8a4848fda9e SHA512 558cddc98b2a1e903d39c5855bf369e6556ff387c5377960f2b650753a9ab029e01f8e751c73c3e7a10198ccaaa192602e153df5cfa5717541ceba2c024e8179
+EBUILD emacs-24.5-r7.ebuild 10822 BLAKE2B a968ee520850bb7fe6e140476dc04f03effc5733fa1069230719b3359f444be7738ef42f27792c6fc55f4313426773dc7668da68d55d7457f72f0193177a461e SHA512 032ae02be12bd7489839c83ff48c53736fde63019e07beacab834ba037a2f9383356c075e780ea725548e6323ac2218c9e83e42a591c5d75f34f381cbfcae36f
+EBUILD emacs-25.3-r6.ebuild 11158 BLAKE2B 458250d53c4f22da85f3850a5b1de63773002784442d78f8febcb196191feb27e2646dc4745030729f77f8fadf8013b98c5e9624c795c6c58c980ba0b944e5a8 SHA512 a2baddb434128159a4e2a95e3861cbdf678fb7b69f9315955537515a0af66b5d3e4d8205dbc14eb2e61326768f2b7832bfc9211934c835efe437912b5563bfb6
+EBUILD emacs-26.3-r1.ebuild 11945 BLAKE2B 4e4c5e2a74eb95738f85b481c3d771e497c35a304114b5b44900cf42c7d5df8993ecef706f14caf124a2792df8baeacccf064476992816320fe4ab7c7ae1d130 SHA512 463b93533bee88ccb08b289ff1dc53446ca21018af27dff471a54675e57f50e64ba2f46be137f03c834bb29319aab1d574a8aca5dfe2b119b067e7a02ce985c8
+EBUILD emacs-27.0.50_pre20191223.ebuild 12956 BLAKE2B 63180b750ed4db9f6b5ec5a4bc908b60cc2afb89698c114a0f5f75ae40c813cc164c06a9473d959354796d4431dfbe196a8f8828e77a654a6ab9e0171a4608ac SHA512 5fd6f8d8f2ceec6c0ef52536ca83e64dda2448b69ed74970f4f393f5074a590596258f1959ad4f3fff38d8aff045391a6fc49228e675920a12d0502b040d0ad2
+EBUILD emacs-27.0.90.ebuild 12958 BLAKE2B 8b33bc95e85307a5a6a8a8f844951631c20134be938865eac1464eacc9d464ad50b94ff971b3836dd31be44f00a2ab7148f79244c8f122499f1ebe0263f96107 SHA512 1a606c4e1912e6aced6a2d86161759335d8220f953226c0e35dd11f3c064adfc5bef66ca9fefc001132dc8ab43fdeb4e11f93830263c8a2a1f5fe727dfe4f934
+EBUILD emacs-27.0.9999-r1.ebuild 12958 BLAKE2B 8b33bc95e85307a5a6a8a8f844951631c20134be938865eac1464eacc9d464ad50b94ff971b3836dd31be44f00a2ab7148f79244c8f122499f1ebe0263f96107 SHA512 1a606c4e1912e6aced6a2d86161759335d8220f953226c0e35dd11f3c064adfc5bef66ca9fefc001132dc8ab43fdeb4e11f93830263c8a2a1f5fe727dfe4f934
+EBUILD emacs-28.0.9999.ebuild 12929 BLAKE2B 6098f27a63351b97ecee5ce0b76923a1445cf5f6e2982720012cf3f64e421d5ada12d8acea84d5e5b12ab29179cd6dce2faffef82f041689416d86f51dbb5fb6 SHA512 ec729a9f22a13674abe295fd7a0b3f8d541334ab2241e528c9492f4552a5c2fddbc5cd682edf923b69896f2f7cced00b468e9f2f98010da6872d1fb4ed393c6b
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r12.ebuild
index a159d3611901..964b14b1384e 100644
--- a/app-editors/emacs/emacs-18.59-r12.ebuild
+++ b/app-editors/emacs/emacs-18.59-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,7 @@ SLOT="18"
 KEYWORDS="amd64 x86"
 IUSE="abi_x86_x32 X"
 
-RDEPEND=">=app-eselect/eselect-emacs-1.16
-	sys-libs/ncurses:0=
+RDEPEND="sys-libs/ncurses:0=
 	amd64? (
 		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
 		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
@@ -29,7 +28,12 @@ DEPEND="${RDEPEND}
 		x11-base/xorg-proto
 		x11-misc/xbitmaps
 	)"
-BDEPEND="virtual/pkgconfig"
+
+BDEPEND="app-eselect/eselect-emacs
+	virtual/pkgconfig"
+
+RDEPEND="${RDEPEND}
+	app-eselect/eselect-emacs"
 
 PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
 
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 259fb7f0e46b..ea117e496500 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -13,14 +13,13 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
+	sys-libs/ncurses:0=
 	kerberos? ( virtual/krb5 )
 	alsa? ( media-libs/alsa-lib )
 	games? ( acct-group/gamestat )
@@ -77,11 +76,15 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="alsa? ( virtual/pkgconfig )
+BDEPEND="app-eselect/eselect-emacs
+	alsa? ( virtual/pkgconfig )
 	dbus? ( virtual/pkgconfig )
 	X? ( virtual/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
+RDEPEND="${RDEPEND}
+	app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 15c84029d9a0..7393476a40c2 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -12,14 +12,13 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
+	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
@@ -87,9 +86,13 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="app-eselect/eselect-emacs
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
+RDEPEND="${RDEPEND}
+	app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 2003b002c9b6..72d0e9f62796 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -12,14 +12,13 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
+	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
@@ -90,11 +89,13 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="app-eselect/eselect-emacs
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
+	!<app-editors/emacs-vcs-${PV}
+	app-eselect/eselect-emacs"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 959bdf99c211..22c804c1e050 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -11,13 +11,12 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg 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 )"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+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 )
@@ -98,11 +97,13 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="app-eselect/eselect-emacs
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
+	!<app-editors/emacs-vcs-${PV}
+	app-eselect/eselect-emacs"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
index 2a5b0f38100d..c6db7de6525f 100644
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -32,9 +32,8 @@ IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+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 )
@@ -118,12 +117,14 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="sys-apps/texinfo
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27"
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild
index 3ad56c98ba2c..b006e62dabae 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-27.0.90.ebuild
@@ -5,25 +5,43 @@ 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/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg 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"
+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="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+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 )
@@ -58,6 +76,7 @@ RDEPEND="sys-libs/ncurses:0=
 			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
@@ -98,28 +117,36 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# 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}"
 
 src_prepare() {
-	#eapply ../patch
+	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
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
@@ -160,6 +187,7 @@ src_configure() {
 		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
@@ -232,12 +260,15 @@ src_configure() {
 		--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) \
@@ -251,10 +282,10 @@ src_configure() {
 		${myconf}
 }
 
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
+#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
@@ -280,6 +311,15 @@ src_install() {
 	# 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 \
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
index b3043e239e84..b006e62dabae 100644
--- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -32,9 +32,8 @@ IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+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 )
@@ -118,12 +117,14 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="sys-apps/texinfo
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27"
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 6f91886c2bc2..462168b70483 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -32,9 +32,8 @@ IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+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 )
@@ -118,10 +117,14 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="sys-apps/texinfo
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
+RDEPEND="${RDEPEND}
+	app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index ccc76f082943..77d1199ef5f7 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-plugins-3.32.2.tar.xz 1474264 BLAKE2B feb116ec201b9eb9630570818cc288f0044ecfc174fc84c7d812aa6dfba5cc3748b4e2351ffa2be0d3a593a58b2318c4296b54b84476fc887195ee27f27bb597 SHA512 2767bc766daba5e1c81ef5a00bc3589a301c02e0286a6622cf11a03b5b391ecbcf9456187563dad4f2916610ee9ddca4414ff4beb639820954385ee3f8091d2a
+DIST gedit-plugins-3.34.1.tar.xz 978800 BLAKE2B 03225ddc414e172f08179c64fbf12d0282c131b71855ca9dc20ceaa5750a5555c7bdde8c4ff1d95c721177b3d379edbcfc9af19ec22b96942df1913d13560303 SHA512 7fe31c2b0a1381a44362bd6066422d182b2246e3f903f8cd83cde0467b9853620a445bea7878d93e95a0a71ac5d5dd081a1930d602007cf2a6ef00b1a45bebfc
 EBUILD gedit-plugins-3.32.2-r1.ebuild 2381 BLAKE2B 1072087ebff2c06b5d27d5a3d60ed8565888626112e1670e58b800a5766733e1c6e946b80e08ed4e1a588be6898a6b8a5da2715d8759e7e1537830b90e23bcbe SHA512 7afac3fb1bd24594b7b8059561c5bd40ddcb9f5620030f6189a3014f62491584958ad52bd6175d74afb609bd3960d4596c8d2bf2e9f0a41f5c2575b1e38c8c39
+EBUILD gedit-plugins-3.34.1.ebuild 2752 BLAKE2B 0191fe5ca358372a4e495ebaa07accd4439617543ac1adf12d8b7243ae4565002f765adcde833fe1d407f280b5a69967b42f951232465d30f8cc6e64254a87bc SHA512 12b83fec16dadc5f01c5e0a8dfbe1e99b4dc11bdcb5e3b53b2f2c96e92d6ae3cbfa6f8c412b719f9fb164d055b0c1c6e313388d27496984a2faff16cb1a4eb7e
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
new file mode 100644
index 000000000000..ea062bc54710
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
@@ -0,0 +1,109 @@
+# 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.16
+
+	>=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.16[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
+		-Dplugin_zeitgeist=false
+	)
+	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 29bb005d9e69..67b6d6f26fb6 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,7 @@
 AUX 3.32.2-fix-parallel-build.patch 5216 BLAKE2B ad6a307be458d828c19bb6981717479a7a9ff3d5405b0abd2b1235a06b78935932104f10b10993fb6672b0c749f525f3192aedadaafb90edecdc663e22dcaaea SHA512 7b408f750e055b68b019301dbd771b309068be6dd599b830679fae89ebf3f15acc95b798e30876664abfc14bfe535eaf8dc4ce6f3b2bd87230a1f2018a37af29
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
-EBUILD gedit-3.32.2-r1.ebuild 2355 BLAKE2B 60ac30d1da1d0ab005e5105829d37ae6839b0893ff6595c7aa82c8a9aa743288fe25ce987ca37566f146f66cf561fd1d37ae9adf59247b28c80faf3896ca8f4e SHA512 da659168215870a832fe4c4f7d2000a9a0324464326cb77e6c256c4eb7008f8e3fa17f58e9e01304a21e81b3d796a4011fba2d213d6bd9af55240d249113eee3
+DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
+EBUILD gedit-3.32.2-r1.ebuild 2351 BLAKE2B c6707e3c092e18b5ed1b7169d2e0532f74567a8328fda40aa410d37c5d6651c9a95d0cd288da521e0635232169f369e6ddc08fa597678c20af601cbf48a00e65 SHA512 546a55c48633bfd7146d4e557c42435e8b81f6d427a1ccdc20f0f9766a07bf2cd17bff489fe0475b06795d16d239841de8a52959d9c5fd36e7b72223580a7b98
+EBUILD gedit-3.34.1.ebuild 2261 BLAKE2B bd90e10893143cbeaf98ae784cb74daf72c5691a8ad810dbe8cfdd75bafba9e184656e77b1784562d5257a67c13cfd969dfcc448a7242799ac304ee96df7f614 SHA512 db0e66515990b45831f07e77a472e82351b8aef07344b4a56095ea487154cbfb3f5df95e71e750a805e3b3468c9a8a41673c004c3ffc268f9fe9e3c4651f745d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
index 8e8bb61899a0..1a70aeb7e31a 100644
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ b/app-editors/gedit/gedit-3.32.2-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 DEPEND="
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-3.34.1.ebuild
new file mode 100644
index 000000000000..bfc2b463f7dc
--- /dev/null
+++ b/app-editors/gedit/gedit-3.34.1.ebuild
@@ -0,0 +1,101 @@
+# 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} ) spell? ( python )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=dev-libs/libxml2-2.5.0:2
+	>=net-libs/libsoup-2.60:2.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_MULTI_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_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=(
+	"${FILESDIR}"/3.32.2-make-spell-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 plugins)
+		$(meson_use gtk-doc documentation)
+		-Denable-gvfs-metadata=yes
+		$(meson_use 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/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 540e3c443ff3..d39f2c5ddcf6 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,3 +1,6 @@
+AUX ghostwriter-1.8.1-appdata-path.patch 811 BLAKE2B d3feb82a74d27484c56e5f05818f8f78914cd269700457deef69854fe8158d1e4068393c7b57114093450f7b347d26e4b143fc426bf5b66e0997f5ee94382276 SHA512 8e015c55dd1905dabb7ddcb06cb8a05e93bf8bdeedfb2002f2568232382871e65251ebfeda632e614e9a090372dde10fb468002459d50641847d4f97c9b789de
 DIST ghostwriter-1.8.0.tar.gz 1195999 BLAKE2B d751e570aed94bcf0806ca20d82b0ac2b465649caf31f01b761f0370a4f1b04ac8f948213b15c05a71541b8068ef21dfb2105b5fc91d5637e498e2d4c8f6bf9a SHA512 aff500d9221f28f6a06a93bf0b5ddb590792b22bc551749b790f52751cd7f2e27ea59778927c2f117320cb1791b45d51d8efdf479f0894319755afb1a509f7bd
+DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521
 EBUILD ghostwriter-1.8.0.ebuild 1069 BLAKE2B 6e50854e96afdfed7057b2b70684cf860e07d4fc59eb83941dbc5ae4caf622a67ba1c9aafad4513eec12e0d3a76d878e90ea31192b14fda88d45f74b0e0614e0 SHA512 f8016952ebf4be4ae9401654eb55577e49a52592a44288339a8ae53160f776a2b7b5c7cd7f6d151d3b190b76aa43a76516fbd3af9ae11ac822dea6f9fe1d6db7
+EBUILD ghostwriter-1.8.1.ebuild 1168 BLAKE2B b5af661d60a19fffeea76b12fad147178817d05de1a15a1f3622cc3ea2862753b7c3397040d2382fb9212203a10b06e0d683249e73b4923a1e337132f62e5ee0 SHA512 bd2133ea0def1ab28ad5cb7bebff067a6b99b479cb016c7a976c019cfe0fc6f301b1a25c21ddd6cc6865572e164efc1b4dab9525644f4d22f1ebbf40899e3529
 MISC metadata.xml 563 BLAKE2B 0f231e68a0335b4e4578d5ec28d8b202a26e7cf5c9f48fe9f4d430b01532aac1cb6022e13ef72c91a3ff68a86ecee0ec780a5bfe7e0c1ac1f158d8cbef84f7bd SHA512 585e39bd37abab4db3422b91a342aac06bcb76b3a6447a60c4607e3ac6edadbbbcabc1480828094d480c241a44d07ba81fbb5a4502f71da75c20e28db4583fe3
diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
new file mode 100644
index 000000000000..514ab6262e5a
--- /dev/null
+++ b/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
@@ -0,0 +1,27 @@
+From 5e63fa9cb6d4020413db071ed68aa85f3e79fd9e Mon Sep 17 00:00:00 2001
+From: David Roman <davidroman96@gmail.com>
+Date: Mon, 9 Mar 2020 21:42:58 +0100
+Subject: [PATCH] update appdata path
+
+The previous location is deprecated
+see https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+---
+ ghostwriter.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ghostwriter.pro b/ghostwriter.pro
+index d399fb5..7f5f22c 100644
+--- a/ghostwriter.pro
++++ b/ghostwriter.pro
+@@ -264,7 +264,7 @@ macx {
+     desktop.path = $$DATADIR/applications/
+ 
+     appdata.files = resources/linux/ghostwriter.appdata.xml
+-    appdata.path = $$DATADIR/appdata/
++    appdata.path = $$DATADIR/metainfo/
+ 
+     man.files = resources/linux/ghostwriter.1
+     man.path = $$PREFIX/share/man/man1
+-- 
+2.25.1
+
diff --git a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
new file mode 100644
index 000000000000..0943a04747d6
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
+HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
+SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+BDEPEND="dev-qt/linguist-tools:5"
+
+RDEPEND="
+	app-text/hunspell:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CREDITS.md README.md )
+
+PATCHES=( "${FILESDIR}/${P}-appdata-path.patch" )
+
+src_prepare() {
+	default
+
+	sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=$(usex debug debug release) \
+		PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 1470f2ee1715..c61d531c02ce 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,5 +1,5 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
 DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
 EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
-EBUILD gummi-0.8.1.ebuild 943 BLAKE2B adeb4a9363684e05f03b09df0c8bd041b86d3d93473377ed4907375852f31af316a792ac9e61f8de36b985c444d79cc81d21fb002f15901bde7ee57247e13bb3 SHA512 7995ac480ab5862c5407c222a1c7c3b2de7fd17d8a6150cf2e51f3a98a2e3360df9a9e9b566c2d0ab61ee1c891da502eb42d20b17c4e41436863af96e6fe62db
+EBUILD gummi-0.8.1.ebuild 941 BLAKE2B cda4a2712cef8c8bcb7dbc532bda5520cdcaecc584adea637b09f254529c0b9d4d46fa2a11d165737ab573f0731c1e3ebd621f17073d642ba0c21af23136c49e SHA512 97240093be39eaa34879ed464538699a14b714775708fe60987cd58756f0acdd65cd87a0bf2a88c31bc70226626ef8e897b9e0ee566d00adcf90dac95d4940b8
 MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.8.1.ebuild b/app-editors/gummi/gummi-0.8.1.ebuild
index df951917e006..9c76d97c37cf 100644
--- a/app-editors/gummi/gummi-0.8.1.ebuild
+++ b/app-editors/gummi/gummi-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 65619419bc32..43d8990db408 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,16 +1,10 @@
 AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132
 AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
-DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
-DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
-DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
 DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
-DIST vim-8.2.0210.tar.gz 14757725 BLAKE2B b78ed42b42d40911efb76d4317c116b1c207909ed47241f9dbe6cf6385a4a25ee8cceb2d883171dd922027fb91e9f25e4741fdcd6ebc69217e7d26eae2f88efe SHA512 118131c7c186bac36b3e4928a0021e03b4bf197e1d5651019f4fcf8d4fee89fb7e0123adaf18bebc932c5e06217904526d0625513646e34aebf6cfdee8885260
-EBUILD gvim-8.1.1486.ebuild 10481 BLAKE2B bf3ea284ca7ec187e32c1cef705867fbbb9292f8923fef15e59b85cd8e97e7d55e364b3142b6e577110171eb80e4174a4a5e9ccdfda5a4f7c6dea691cf1c1a08 SHA512 e1a91b847174c14d0a5cbb56b847a4bf0a6d406359305b49cc39847801d88dc88d95ecfab9aad5f53e3e79b293d7241c60103b56a927f1f31343935b3573ace3
-EBUILD gvim-8.1.1846.ebuild 10556 BLAKE2B 7df798e79326c4bbf64be95fcae2f3ac4668dedc949211010cc6f82c69d2e85f6ae96089c063947bf424a33e2956bcbdaf044a43bbaa8375e5f5540c1daeb434 SHA512 acb4e88bd8fa52f8fc69eb038030f3d148ec916cbcdd812411b8bb58ed7a2801bdc32a04b7af057d925113c6353aade536cc1a5a8da138a1ffd0e54227bb4837
-EBUILD gvim-8.2.0055.ebuild 10556 BLAKE2B 66fd819bf91a53ef4535df4a63c0cc85b65c33d5d5db66219d5e895bddb5c7f2eea1fb2450456d549cfac2143d82fcd5bf1c2150cc39f4b91f60416fa367f2f4 SHA512 7e7693d91affa860adb941c25dad8583abbb5720d7fb2aa44919e9850cac8ef6b711dd138fb1799029f7f918164f4ebb175e4a9d461a5adcb234121f069dd62a
-EBUILD gvim-8.2.0114.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
-EBUILD gvim-8.2.0210-r1.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
-EBUILD gvim-9999.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
+DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
+DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
+DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
+EBUILD gvim-8.2.0360.ebuild 10326 BLAKE2B 4fd00bb56f9cac3143d22d7d080046a4ac76a8d64b13ede6614527aa5c69603b792f5b0ec5efb9284978a1c782454211bf23ed25fb96e6994352602bc97b350e SHA512 37b60dcc8805c6aef6e1b1a3bb93fa96ad6b12a66614f30858018f369843d77ab57040656b710fd818bc2c823a43202ce52dff5a6aff1e1912298a72e51ea2cd
+EBUILD gvim-8.2.0508.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
+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.1.1486.ebuild b/app-editors/gvim/gvim-8.1.1486.ebuild
deleted file mode 100644
index cf6219d16b38..000000000000
--- a/app-editors/gvim/gvim-8.1.1486.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
-PDEPEND="~app-editors/vim-core-${PV}"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_with python python-command $(type -P $(eselect python show --python2)))
-		$(use_with python python3-command $(type -P $(eselect python show --python3)))
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.1.1846.ebuild b/app-editors/gvim/gvim-8.1.1846.ebuild
deleted file mode 100644
index 270617a27f6d..000000000000
--- a/app-editors/gvim/gvim-8.1.1846.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
-PDEPEND="~app-editors/vim-core-${PV}"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_with python python-command $(type -P $(eselect python show --python2)))
-		$(use_with python python3-command $(type -P $(eselect python show --python3)))
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.2.0055.ebuild b/app-editors/gvim/gvim-8.2.0055.ebuild
deleted file mode 100644
index b03fab986ea8..000000000000
--- a/app-editors/gvim/gvim-8.2.0055.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.2"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
-PDEPEND="~app-editors/vim-core-${PV}"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_with python python-command $(type -P $(eselect python show --python2)))
-		$(use_with python python3-command $(type -P $(eselect python show --python3)))
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.2.0114.ebuild b/app-editors/gvim/gvim-8.2.0360.ebuild
index 2bdfc5eb2348..2176fd3dd89b 100644
--- a/app-editors/gvim/gvim-8.2.0114.ebuild
+++ b/app-editors/gvim/gvim-8.2.0360.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIM_VERSION="8.2"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
@@ -15,8 +15,8 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.0210-r1.ebuild b/app-editors/gvim/gvim-8.2.0508.ebuild
index abe335c6f243..3542682bc039 100644
--- a/app-editors/gvim/gvim-8.2.0210-r1.ebuild
+++ b/app-editors/gvim/gvim-8.2.0508.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index abe335c6f243..3542682bc039 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index 3c11eedf9a94..f3d9d9503201 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -4,6 +4,6 @@ AUX hexcurse-1.60.0-Werror.patch 291 BLAKE2B ce310d08d4880d53c2eb3c17794294cc124
 AUX hexcurse-1.60.0-tinfo.patch 386 BLAKE2B e4f376cc9cf60c9163553aa9082e5c84a228f0704c575941414cde6527cb6c9b867d55cba45dbb35bdd95d79ee8d13acee3a139256d794f9f648af87581ed458 SHA512 ce0c25842a874d631d75826f6b967fe0d0f53a435e6222eed1310caa884b570c1cf131c14e0be84fc7de728e37cdaee5b950ada527fd03ddba0dacf578e4fe42
 DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174ca3cc7d29232c6d2a2f909339a0555ff459ed373e62e35b3d1d8abfbbd32a9462006b20bfa1f4f641f4eba825 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7
 DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
-EBUILD hexcurse-1.55.ebuild 670 BLAKE2B c18685178bbce070ecbae762e971ae35caf748c41d0ecfb31545adefdebb759792045e1ee9fe12205f733c93db2a6739f46b4547b9ce51d3b264f804c0a449ae SHA512 6024d0e5aef218f9bfa64096ecaf2b63eeb606a0d21371f374c3f8a55076b681d00ba8a3359475ddfba918984735ffa67246f4938888a0468950a04357018c96
-EBUILD hexcurse-1.60.0.ebuild 713 BLAKE2B ef37131406f851827fc94f0524de69bf0e79fa823acf982e8ca43751ea63a286fee96859839101274c03248561f9a8f337c966f8b78eb5608dd5e9c7b01b208a SHA512 98cc4f96741c84ca32b5b2bb7f9606b51d6f4e105672bb5cb0ddac18439baf8c96fe78c67203e96ead5d8352828a740018d73c258004a22be4f4de0d912b5bde
+EBUILD hexcurse-1.55.ebuild 667 BLAKE2B 3e6fbad3a1f63fee93d6b0e95f3fca1b169f4f47ec4a24ce8ccefbad01a1f88a159ff3b8b412a77fe19761fbca3a92649382e6dba3adacf94b200f4cc22a8814 SHA512 46c9e32f704a557cc6d8445b711aa22da954201a894ee8d71f7d6aace738a41c1939df969595043ca62a75375c8fc2fcb3172c7b284f42a6906aa5f07ed780dc
+EBUILD hexcurse-1.60.0.ebuild 706 BLAKE2B dc3b15be8fd7f967c25624ff29ea7ddd29e6dd787d427d6ac3ea0cebb73e1d89db13c05d91170f12af24dcd755de295f02942b852f340f8c40788b3f1bc1feb8 SHA512 6c69ea5924d248d9c4bcaf6a801377ee070bc759702568cf98ffcb4b03dd907f6b9a633cf7cd380d5a69f2fb823068d3efcc002b5e1c624feddb678b39dc4e22
 MISC metadata.xml 463 BLAKE2B 104010d8e61f58282a944b121dd649fbceca67fe8981030d7aae737bf709029a94c75bfbd648c07bfbffedfee10cc0cb5718da7376eee7b4b5ce014a987acb6c SHA512 571a214805d30efc4f0f8a83964938e175aa1cecdbf76c1153189315dca316b625507860ac86b14209ff116706e8beedbea7b66aa5714ffde264ca94a88270c1
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
index 4e42c8589733..cc3483748d0f 100644
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.jewfish.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0="
 DEPEND="
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
index 656648c05e7b..95d897125147 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/LonnyGomes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.2:0=
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index ccaf180ab4c6..8fece83b239f 100644
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@@ -1,4 +1,4 @@
 AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a
 DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb
-EBUILD hexedit-1.2.13.ebuild 696 BLAKE2B c7846127cdf5d46fb379ec50c74bffacbb053634cc7ac1d563bff86a64e104a0c24fffd5b73e2e927830da64e2cdaee76c23a0058dbf1442f4ed43e21fa2f1dc SHA512 c6494ebeb95b9b635dfe00b340599544d566ae0a14691dc32b9b08a77332e86a3e8b218c85497eba5dd249ed33bb041ead4fc33c529ac8870150243dd19824e1
+EBUILD hexedit-1.2.13.ebuild 693 BLAKE2B f5dfa23943d5d4868a4e48a90c665b6803775b74574abae9da7486362d844219409c8bfe4332155e54048591cfae59af2096471a33c2fe96fea758600a6f8128 SHA512 ff9c94b031cd37ab7d21c3706e5238617942084ff6afaf7a035a6cae066fbab2c5be3896afaacafe73c38578f51d05cdb7c8aaf16c6d9a6bdf8fe1204abd2fe6
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index 65402f656eeb..f06e9e63f500 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rigaux.org/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index d13338ef01eb..88e7a72e4f4e 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -4,6 +4,5 @@ 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 1249 BLAKE2B ff9ac8b1913e12b6cbf1fac05385dec458bf5c2d02d768505d782c736e88a70fcc9d838b718855a040552fff7029f06fd5245d9243cb53ca43aab842df06147b SHA512 84e4e21205388ef1b0282132fdd07a5719dd2562faaec5676ff205ba2a63b995df5f20674267b3565fab6ef77aaf3b93f8a9a07c9a46ebf5b77c53ddbeccae31
-EBUILD hteditor-2.1.0.ebuild 1173 BLAKE2B 4a61d5860885b2ef48f0f21621abea57429dd36ebbba36a6250954785880d8cdfd648a0827756ca38b25b33691fcc64afc06c11e7bf59d8823ac7068befa9d67 SHA512 6022aa8a28461dde621ff2a02695b1aecfb4473bc451a9555350f510773882534e8283e711c69037f1787a77f7483312e7645a0660940d60bb6eb968802bafb5
+EBUILD hteditor-2.1.0-r1.ebuild 1245 BLAKE2B a09a2fd5338de9df7f5f7effe9692d0c80be642a0362f38b0fecb45224161de4b2a926662e8cb52b4b802ff6fc47f67fc258faf96e66dd93cc818ad0573f14b8 SHA512 d4be8a225b7c710b6350b70113cfadb869b4bf7a4a953871550d613f3183a0a5888e8cf36a87ad17ec25a57c392587719a745bd97ca2cbe75ef5b3206bb017f1
 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 5b468939e1f1..44b7dd140f67 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild
deleted file mode 100644
index 837b225b19b7..000000000000
--- a/app-editors/hteditor/hteditor-2.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/editor}
-
-DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
-HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
-SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	>=dev-libs/lzo-2"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-gcc-6-uchar.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable X x11-textmode) \
-		--enable-maintainermode
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	#For prefix
-	chmod u+x "${S}/install-sh"
-
-	local HTML_DOCS="doc/*.html"
-	doinfo doc/*.info
-
-	default
-}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index d67940edc4c1..14b294cb800d 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,7 +1,7 @@
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
 DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
 DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73ce616e1c29ed22fbaed42cb78e7c9fbcd2424d98f86725fb00cee5160be4fe40abc97a927201557b684f800 SHA512 c6cda5544210bc3d3fa3cbb8494e60949e10ed3716d96b76d0c9e7f5671c7a85f6e7e7a860cfd05466f1bf52112053c722441ff338210c0ada89f10515ac170a
-EBUILD mg-20171014.ebuild 1022 BLAKE2B 42529172df6ebaeb310dbfc5e871e08126af01b013da40f141d233671b55133cbe7417affc6872cd3040357c04a2094e68c8c67370bff5f080d52341f03fc119 SHA512 33dc80e03ce4b7094221a85748962b89f83ba0301bcc6b4e20da33ee1f5abed4aad17b8fd0caff4383c95e6f497d1d5f11d92cb10c9fd06591a32d2e305ce114
-EBUILD mg-20180408.ebuild 1038 BLAKE2B 94c2a65dd5aa2dad60ef573c9b0fb3a8dd7e2874b8dad6999307f0fe996859760f697f5617680ec14ed23b8314765a67612e5843d6b9382fd0a364df7f4baa81 SHA512 8ce648f61e4ed9572a80ab8c1328498191c5a6f31e8b0c032f5af7fc69e375034852d8d71d5daba9f99d9c93c0c7620174f49e80f75f8344b164a46dc2dfd154
-EBUILD mg-20200215.ebuild 1044 BLAKE2B 0f9d72a829a5a7b94698e82c6bf557f694a04fd95d7fa878e31ccd46fb36a003ed6c5237e595bb0041fb4e4cd45381351080ab8e5471faa93f05aa537c927307 SHA512 c7f5d1a7d7211809c1999d25ed1ddace5a7d1d23185a5a09790e904b267e9bf3c223a4dbb26a0c778c077bc0d53fffcad0e0aab6e95a6f543a29cfe1b19fd389
+EBUILD mg-20171014.ebuild 1023 BLAKE2B a6b86a471504c94104f4b4174cecfe878104b8d3d18ee6e5b5d005e7c19ce03582e68f6306ff8190f4e0bddcf84b223fd1d2d7b3d923c82c6f794daa0c370000 SHA512 845d09a9e38d0315cc0c2383aa3d65770b73c6dd8a494acb32c471b82d5243072236324a5428ca5a9a6200b75b0fe7a8366c4a94bed2c0f48d683ef36ad8628c
+EBUILD mg-20180408.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
+EBUILD mg-20200215.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
index 47478a302f6d..da406b5556a2 100644
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
index 5e8bfbef1b6b..c1f6b5cda47e 100644
--- a/app-editors/mg/mg-20180408.ebuild
+++ b/app-editors/mg/mg-20180408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mg/mg-20200215.ebuild b/app-editors/mg/mg-20200215.ebuild
index 5c0a16154558..c1f6b5cda47e 100644
--- a/app-editors/mg/mg-20200215.ebuild
+++ b/app-editors/mg/mg-20200215.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index bebeeed3496f..49841bac0fd0 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,10 +1,9 @@
-DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
+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.7.tar.gz 2977920 BLAKE2B 8373ebf3f4e98ba204ed00678ba1e8791c9ffc11226baa98b7dac9ff9389cc465dc6574833ce222570301232a97f87e1b8d505dcce617f6c8bd915f4a662df4d SHA512 2cbe2341bba46f57a692d6deb20003d992da0230fdec3a2dc485d3b03d2ec2a70e66d05299bbc719fca658c8a8060dd64d4b52e68aadfd73980b82445761615f
-DIST nano-4.8.tar.gz 2995765 BLAKE2B 80acb19758c4bedfa1fa52ef9ede7125bdd3844df6932912899ba2f5c4471859ac6d044b2c67d43afcfc416d0b6bf0b5d023e79645c5d6207c5ed4a0857305a4 SHA512 3e6f8f2a7ce55df0eb2d96459a22f0a40808b4ffc67eb5a35937437f5c1cb193046b02d123597981066b872ffacf345bf0f4c72f546323324ebb66aa751d11f9
-EBUILD nano-4.2.ebuild 2168 BLAKE2B 73df0f858fa59d27927cad6f530fe1de0a87adabf48242b1bc1689deb203a79d9e08c5ef8e169aa1d19aea640e4691a94765f2d193477a7de9ce155556439589 SHA512 89cad6300b1ae5ecae8b7d3a1b36b2595582392cb65d9d6dbd7280c17e50d69c3e87e301a7db8617123e40d10fd6137a7d1f78c2cefb38072b309bd7d33d13ae
-EBUILD nano-4.6.ebuild 2170 BLAKE2B 0f57307e8cb772be9e724eb03605465c41cca60e941a99ae7add2a31cfa1066d25b629721a25c7a3166d33bacba13965543c6ddc7c819945642ae451df93b8d1 SHA512 212eff2f9f01da5e094a378f5a46c968e853423049a93b4183ecb973926cd9394edb12f0bc2012d2c207b028377a4957d5d49ba1be45e3f106894c8e8b88e5ac
-EBUILD nano-4.7.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
-EBUILD nano-4.8.ebuild 2180 BLAKE2B c4c21a1b68f1b444bd37a83eedec29c16b0d41fc0861ea985e5c6f91d79de49a69ca5c9aae0826c9b8f82743dcb0721fa32df94b4a61f322d4ad4770f5e247b4 SHA512 22ee6cdf0d25af8c165c9c2241f1fd8eab261b830b169412ec75b629ce6bbb22a8b3b9a98f9c66d7a6de54a251c09ef00105402ff185747705cdeca179919f84
-EBUILD nano-9999.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
+DIST nano-4.9.1.tar.gz 2995183 BLAKE2B a5e455d94e683bd3ae00c37bd4395465ded281e1cbf434a0035b2d816b53b6d24f3fc966c44c8da643122dc2920f8ddefb0d37574baafe947dd107e1ede7034d SHA512 155622092ee5a99dab30a6acd5cf35ecf087476aa48eabcdf7e1259af098483f84eef7569380fe7c47d4d69f63e61af10a3cc5c29c45f1242c17366c0f15835b
+DIST nano-4.9.2.tar.gz 2996106 BLAKE2B f3de611022f72de050f96b254a10fb9587014e4e239e34024d1941f9bd5d6abef17dbd1da95bba7cd328237137be1c79421ef7423cf40bab6a5577f9ae8ba587 SHA512 bbb43b63e03d104f168394c00778b5674249285c2400bb4664738a5badc7e5320b5a96f6b0275aa4e6f34f8127830564e87a8658442e358e5261116c595155b6
+EBUILD nano-4.6-r1.ebuild 2237 BLAKE2B db4fb753e8949f3049410ac0fb8d34239d1c1e05695a524aa65cb56bed024d81f7144c1bbb6474128a80fb07ea23943e804de96380053450949530554c6e4165 SHA512 de8b6e421684b4f11bd9e913e521bfbc1e6403751a9fa6af74c8ca6d90fbc2ef46d520939004a92c07a716fee66114bc244e8d862c91d823121791f36ee8eb8b
+EBUILD nano-4.9.1.ebuild 2176 BLAKE2B a904639e81b80ea3aa0bdfbf9b11abd81f9b84580e8ff1b763c47dbbcfa5d7742086336dd223b02127d1bc03265b9bacc974e091cf96e190e3ebd1c7dfdcc89d SHA512 f27889a95c6d7d0dbdf4caf41a17177236daea30b723aa0f8e122b802fef6b9806e745f337f0f6fada69abd288ba7dabdb57a57ea1433c30204938cb2aae632c
+EBUILD nano-4.9.2.ebuild 2176 BLAKE2B a904639e81b80ea3aa0bdfbf9b11abd81f9b84580e8ff1b763c47dbbcfa5d7742086336dd223b02127d1bc03265b9bacc974e091cf96e190e3ebd1c7dfdcc89d SHA512 f27889a95c6d7d0dbdf4caf41a17177236daea30b723aa0f8e122b802fef6b9806e745f337f0f6fada69abd288ba7dabdb57a57ea1433c30204938cb2aae632c
+EBUILD nano-9999.ebuild 2176 BLAKE2B a904639e81b80ea3aa0bdfbf9b11abd81f9b84580e8ff1b763c47dbbcfa5d7742086336dd223b02127d1bc03265b9bacc974e091cf96e190e3ebd1c7dfdcc89d SHA512 f27889a95c6d7d0dbdf4caf41a17177236daea30b723aa0f8e122b802fef6b9806e745f337f0f6fada69abd288ba7dabdb57a57ea1433c30204938cb2aae632c
 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
new file mode 100644
index 000000000000..e18425a6b802
--- /dev/null
+++ b/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
@@ -0,0 +1,34 @@
+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/nano-4.2.ebuild b/app-editors/nano/nano-4.6-r1.ebuild
index 487a1075c22d..28d67f86b940 100644
--- a/app-editors/nano/nano-4.2.ebuild
+++ b/app-editors/nano/nano-4.6-r1.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 sh 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,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
+PATCHES=( "${FILESDIR}/${PN}-4.8-justify_keystroke_crash_fix.patch" )
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-editors/nano/nano-4.6.ebuild b/app-editors/nano/nano-4.6.ebuild
deleted file mode 100644
index ed4ecd485072..000000000000
--- a/app-editors/nano/nano-4.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 ~sh 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
-"
-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
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-4.8.ebuild b/app-editors/nano/nano-4.9.1.ebuild
index 399fdff323e8..e27dda0e78d7 100644
--- a/app-editors/nano/nano-4.8.ebuild
+++ b/app-editors/nano/nano-4.9.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 ~sh ~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"
diff --git a/app-editors/nano/nano-4.7.ebuild b/app-editors/nano/nano-4.9.2.ebuild
index c3d78b31034c..e27dda0e78d7 100644
--- a/app-editors/nano/nano-4.7.ebuild
+++ b/app-editors/nano/nano-4.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sh ~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"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index c3d78b31034c..e27dda0e78d7 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sh ~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"
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 9b0f4551ab61..a48b6aedb99b 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -10,5 +10,5 @@ DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815
 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
 EBUILD nedit-5.6-r1.ebuild 1977 BLAKE2B ab5c14e099bcaf0573493b6c9f73072427c3b77a876b79b62337b4001a93f0d59fa8139ec2be260f2ff5b8b2f982673ac00de5573241f68413f564760c566bb0 SHA512 6895f39046a30f9e55279622c7d9a1f33369f8a6a2e9244c0a20d11b9e6880c63bc5be1f98ed548c5e841500ec2db81a9b85f6db5c5fec90148ad0ff06e652f5
 EBUILD nedit-5.6-r2.ebuild 2027 BLAKE2B 08aeeb58ab2870a0dc8139b8eb0c7e218f22b46da0bb385185969ccba7808a52cf551a0549701d568be7ad88ad103f02b9507fc810c3cf90d2d73a1cb584c6a7 SHA512 038ef549923cad319852d95a704c4f0e946a3121f920b8d405817cf0bee7dac7ae6c11eb53e09cd9c95de2c665a9ca74d2b4092a518af9ef6b1673519c5ec123
-EBUILD nedit-5.7.ebuild 1983 BLAKE2B dab69c3457dafe874dda1c22efef39b6d6abd130de845907a41184cbff49775e240a12ad2d782a02d76a06c097be2bd3d04fa83c4cf1a58068f73f3062d74ff4 SHA512 92856002bd8db8724abbcaa6ad78b1d2435d39bd7a6537e65f23467649dc2234723f488f353177bb0a5fe8560fe395f4b843c25a1d5fcbc868b16dd4b4134009
+EBUILD nedit-5.7.ebuild 1983 BLAKE2B d4f3a244277aa4f9da9d5e6eaeb260c61462ea0aa27d89a3bdf4618ab2927f47d9917ade1b3c9a26cc468b66bfcd0b0d315c0c1daf4c93288a96849ec5c8f1e6 SHA512 b06ff9e0984de9b976f77cd64d2f4fccbf12db5542f82da57f23e14b6794a42635776b1067b903537dcb9f7a0ffd9c6e5e8bf9b823558bb5ac94db015d96ecaa
 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699
diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild
index 69f74a487102..25f9ab97f1db 100644
--- a/app-editors/nedit/nedit-5.7.ebuild
+++ b/app-editors/nedit/nedit-5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,16 +35,16 @@ src_prepare() {
 	#respecting LDFLAGS, bug #208189
 	default
 	sed \
-		-e "s:bin/:${EPREFIX}/bin/:g" \
+		-e "s|bin/|${EPREFIX}/bin/|g" \
 		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
 	sed \
-		-e "s:nc:neditc:g" -i doc/nc.pod || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
+		-e "s|nc|neditc|g" -i doc/nc.pod || die
+	sed -i -e "s|CFLAGS=-O|CFLAGS=${CFLAGS}|" -e "s|check_tif_rule||" \
 		makefiles/Makefile.linux || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
-		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
-		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
-		   -e "s:check_tif_rule::"                             \
+	sed -i -e "s|CFLAGS=-O|CFLAGS=${CFLAGS}|"                  \
+		   -e "s|MOTIFDIR=/usr/local|MOTIFDIR=${EPREFIX}/usr|" \
+		   -e "s|-lX11|-lX11 -lXmu -liconv|"                   \
+		   -e "s|check_tif_rule||"                             \
 		makefiles/Makefile.macosx || die
 }
 
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 78f1ac616023..fa67bdfaadfe 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,8 +1,4 @@
-AUX notepadqq-1.4.8-qt-5.11-QDateTime.patch 682 BLAKE2B 34bf2eed6c5499f79caacdcb51e3ec1d09951bafb38f3a66308a33d5cc3724c36787aa7fed21bd1eb23b34517572d0898274d03b2963dd420fd7210a669f2b39 SHA512 a80234dfe6308ac223ce8e9a8117e06b93d1f13034c978a2024c938699864d4609e20a9f077c2bc988ccbf7cb957744068b65e93e5d53c0e5f98abe635e8184f
-AUX notepadqq-1.4.8-qt-5.11.patch 664 BLAKE2B 442012f9ad0046abf7ed6206d69db42b49b0f9d407ae99a4e7a6df0d5340dfadd664a3e8f97a90beb41014bba668174ca6090c9ad46dd090013ca3ffa07d03f5 SHA512 584e7f4c4032719c42eafcc9ff23031c7e980084aeac3044669a136be33ebc4fe0b6e6e61dbf1a70195953949ac05fae9150f97fb369bc9399ddae099a744549
-DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
-DIST notepadqq-1.4.8.tar.gz 4418925 BLAKE2B 91d993fd952609a7255c6541e97580b5dd01e6902cb6a84b77da7fbf8bc52a9a07ba85845d33e5801d539d8c560804b69947df965550dfb981e228330ea46ffd SHA512 fa1937b75a378fb81486a871a5b736f6ba216cd4b71f99e342e457de65ea034c2ee4d2c9f42754c4737671ccb1083fb1e6c946240ab2094042125430578141fa
-EBUILD notepadqq-1.2.0.ebuild 929 BLAKE2B b21202f5e541df1bac7d48ed0e0bf59b9d99a70dba3b26fbadb0febcb8c8c90d7c5fc5bbe275c7c723275ce14557ff2a42a3ef01dd0343fd06e2ab420dbd3d31 SHA512 f7eea0a23d1027da845a86a07fefab372dd1cd3dbcca990b73a014127e23a6a72dbffa5d58f818224d56f6422f22d346fc14bbbad0a286fada7c2373967538bd
-EBUILD notepadqq-1.4.8.ebuild 1104 BLAKE2B fea940bb98eb1fdc902ccf6ce0ded0ff606705c4aa50bdace255f887dbc22bcbf60b843690a06e693799c5772c80f8ff61676bbde38332cf712f4108f75e55ab SHA512 00dabd3049c1b8a1e2401e4c22761cc3a56d2d37f53a72deb0013508418818247ace97e98cfe74a42d4b30772f2675f5b16e295733a3f23ac46317596f734cc2
-EBUILD notepadqq-9999.ebuild 1092 BLAKE2B 3b7a60dc54f044342a6c6c1ce5b85f66aa8577eb31df81e543be9a8eb81f53ae1204e0a6d1542910bd88b7ca9ae1680c2626525b20fe13835ded6d1a96224f0c SHA512 8904cab648cf44213d0436c13f45e261426cba1bfe40ab3caf33dbb9dd40f76432adc74811b7d70f4995dde84298c439947816ae6302557ffaffe14a1c361d20
+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
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
deleted file mode 100644
index d0158c33527c..000000000000
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 26 Feb 2019 00:47:26 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
-
-Downstream report: https://bugs.gentoo.org/668392
----
- src/ui/stats.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
-index 59837c9..e0f3cbd 100644
---- a/src/ui/stats.cpp
-+++ b/src/ui/stats.cpp
-@@ -3,6 +3,7 @@
- #include <QNetworkAccessManager>
- #include <QJsonDocument>
- #include <QNetworkRequest>
-+#include <QDateTime>
- #include <QNetworkReply>
- #include <QSysInfo>
- #include <QTimer>
--- 
-2.21.0
-
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
deleted file mode 100644
index d656bd920940..000000000000
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/665286
-
-From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 23:23:08 +1100
-Subject: [PATCH] Add missing include.
-
----
- src/ui/EditorNS/languageservice.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
-index bbe03dc..9a0f212 100644
---- a/src/ui/EditorNS/languageservice.cpp
-+++ b/src/ui/EditorNS/languageservice.cpp
-@@ -6,6 +6,7 @@
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QJsonValue>
-+#include <QTextStream>
- 
- namespace EditorNS {
- 
--- 
-2.18.1
-
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
deleted file mode 100644
index fbdfbecdd1d7..000000000000
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	default
-
-	# Silence a QA warning
-	sed '/^OnlyShowIn/d' \
-		-i support_files/shortcuts/notepadqq.desktop \
-		|| die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
index 804533a3e34b..2da7d1d0936a 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="Notepad++-like editor for Linux"
 HOMEPAGE="http://notepadqq.altervista.org"
@@ -11,8 +11,9 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-3+"
@@ -20,21 +21,23 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	app-i18n/uchardet
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
 	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
-
 src_prepare() {
 	default
 
@@ -51,11 +54,3 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index f906b948b04b..2da7d1d0936a 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="Notepad++-like editor for Linux"
 HOMEPAGE="http://notepadqq.altervista.org"
@@ -11,8 +11,9 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-3+"
@@ -25,6 +26,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwebchannel:5
 	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
@@ -32,8 +34,8 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
 	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
 "
 
 src_prepare() {
@@ -52,11 +54,3 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
deleted file mode 100644
index dfc2e6ad49da..000000000000
--- a/app-editors/nvi/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX nvi-1.81.6-ac_config_header.patch 410 BLAKE2B d47c639e45fae8521e6a70492b73e91728c6c790df7c90b414da69c3af9d1aca442ee61f6cd4b7863f4e167d84036bf7f7b3b472db48cdbb26ae33f62ac4e9d6 SHA512 ef4fb4869b8dbf0a1677aba99f00de5730dc64f48aab35de113f91d22aea769054d2ce875af7c084d1fa3c3a526f2695fbba9ad248c86a296e6c2580c682f8d4
-AUX nvi-1.81.6-db.patch 690 BLAKE2B 84f57da7f49f9d62ed8bfe2104dbc5d6713e378b88356d4dcda3da2a0d3ede782678c16f76871271b16c07b1c1c2703d48e4d41baa44af2a62f330c8621ec860 SHA512 83c8d875b57a73a012bb22935c99b814e7836a809fe1e4eba0021425892dcb66930cded4c2a2af38984db25d23285ce86aaf4cf2def8acb5f669ada368f30f28
-AUX nvi-1.81.6-db44.patch 1351 BLAKE2B c90ac2bdad322a63e2687a0cc6455757a75fab5d7db9597a5291b7b3df6dd3624c55b5346fdece22ca72538053ddac7aeae1837cbd5a2f7883d832226293322b SHA512 d59b3dd860562fe433379951405527825977d3e847a6575d30deb146e0fb8617e13c1962fca0341557093f34a725bb131d2979c15466d8fc6194ad1f928a7e7f
-AUX nvi-1.81.6-perl-as-needed.patch 2807 BLAKE2B fe2d17e99f6ce258388c001e1dd23b58e50e5d3608d1a295443acde146b22fc0494141ac68d42f80dac94e3b97e57fb57582780f355f9706a241a6aad47450c7 SHA512 9bff6bec4970240edcb43e66d17e26a3a035d003124f355f8688794fd3459da6d2d64435a19dd8b701cc4f75c24680299a7407c779fbc0a96647e31b3a1fa21f
-AUX nvi-1.81.6-perl-shortnames.patch 384 BLAKE2B 703ba7c2248b327151f280528689a3c478acc5ffa91f193aca323d6bfb38cfae1b6461424fc9326498c08e66dade54f6a486bde8f9126d4ea244b06c8ea4bd98 SHA512 f013a692ff5d62f41b6fa39c8ddea5907c2ed4dbcf4c84725edb71c61aa09dd54a470ee1228eadfdda745a6eeae653f490b30f7e77952b66515285ecbf2f82b7
-AUX nvi-1.81.6-printf-types.patch 437 BLAKE2B a7cf425c52882b693e928af13790df0959167a64f201d2a41059d3ae21470241020cd604be5418560652729858696ba4e40356c1753daa2906dcc94247675b34 SHA512 8da354d7278300fea44e9dae1f539c23211257aa9475e5a223f7d3aca7d5edaebf6245923f32174cece3386f5564a7794efd6ef2394bbdaaf35c14b99a2c731b
-AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 BLAKE2B 2c764c05ba9e8745369441062452e6bcdf6c065d2c9a040d4ef0f3d2041ec31c574be18bca3432b3ac252c693e2feec4f7df9851055305bad9760fc33d7220ec SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196
-AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 BLAKE2B ffdef923f5355ab4839955865cce148c8713517d19c5c6cb8fc4dcff227c1c833bc120d505f36d81240d64d4a0472628c61a28456db1675ecc2d47c3323a1507 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906
-DIST nvi-1.81.6.tar.bz2 1758309 BLAKE2B 7aa9b1a7f5337bb246a4a8779180830efd2fb1cfeda2c0d5fc153393cd683237cdfc2a69ac22b228629561ae2222d4eb36746fae4dfb6b9ff44945265988929a SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd
-EBUILD nvi-1.81.6-r7.ebuild 2086 BLAKE2B 8ac872a8efd3e6742cdc3a9d624d4b266c4e181df5fc04dd3d2c24460838b4a9dde6ec0f2b532de2d60d70e9dde58f9e37df69c44806f13df155feecee80d4fe SHA512 24b313b09fb37bc5894e22c0e4ede66a0dcabe83bff45fd38f998b0d74186caf12fa58c583169d9c00e0448972c3e3c7845db7b647f65c2cbc54600c183664f5
-MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/app-editors/nvi/files/nvi-1.81.6-ac_config_header.patch b/app-editors/nvi/files/nvi-1.81.6-ac_config_header.patch
deleted file mode 100644
index 49f9453983bc..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-ac_config_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr nvi-1.81.6.orig/dist/configure.in nvi-1.81.6/dist/configure.in
---- nvi-1.81.6.orig/dist/configure.in	2013-07-09 16:54:56.000000000 -0400
-+++ nvi-1.81.6/dist/configure.in	2013-07-09 16:59:35.000000000 -0400
-@@ -4,7 +4,7 @@
- AC_INIT(../common/main.c)
- AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE(vi, 1.81.6)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- dnl Configure setup.
- AC_PROG_INSTALL()
diff --git a/app-editors/nvi/files/nvi-1.81.6-db.patch b/app-editors/nvi/files/nvi-1.81.6-db.patch
deleted file mode 100644
index 70015261aee4..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-db.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/common/exf.c
-+++ b/common/exf.c
-@@ -228,13 +228,18 @@
- 		/*
- 		 * XXX
- 		 * A seat of the pants calculation: try to keep the file in
--		 * 15 pages or less.  Don't use a page size larger than 10K
-+		 * 15 pages or less.  Don't use a page size larger than 8K
--		 * (vi should have good locality) or smaller than 1K.
-+		 * (vi should have good locality) or smaller than 1K. DB asks
-+		 * for a power of two, so give it one.
- 		 */
- 		psize = ((sb.st_size / 15) + 1023) / 1024;
--		if (psize > 10)
-+		if (psize >= 8)
--			psize = 10;
-+			psize = 8;
-+		else if (psize >= 4)
-+			psize = 4;
-+		else if (psize >= 2)
-+			psize = 2;
--		if (psize == 0)
-+		else
- 			psize = 1;
- 		psize *= 1024;
- 
diff --git a/app-editors/nvi/files/nvi-1.81.6-db44.patch b/app-editors/nvi/files/nvi-1.81.6-db44.patch
deleted file mode 100644
index 4d4c75d2cb35..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-db44.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-  First part is adapted from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain
-
---- a/common/db.h
-+++ b/common/db.h
-@@ -4,7 +4,7 @@
- #define DB_BUFFER_SMALL		ENOMEM
- #endif
- 
--#if DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR > 3
- #define db_env_open(env,path,flags,mode)				\
-     (env)->open(env, path, flags, mode)
- #define db_env_remove(env,path,flags)					\
-@@ -16,7 +16,10 @@
-     (env)->remove(env, path, NULL, flags)
- #endif
- 
--#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
-+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4
-+#define db_open(db,file,type,flags,mode)				\
-+    (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
-+#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
- #define db_open(db,file,type,flags,mode)				\
-     (db)->open(db, NULL, file, NULL, type, flags, mode)
- #else
---- a/common/msg.c
-+++ b/common/msg.c
-@@ -724,7 +724,8 @@
- 		p = buf;
- 	} else
- 		p = file;
--	if ((sp->db_error = db_create(&db, 0, 0)) != 0 ||
-+	if (access(p, R_OK) != 0 ||
-+	    (sp->db_error = db_create(&db, 0, 0)) != 0 ||
- 	    (sp->db_error = db->set_re_source(db, p)) != 0 ||
- 	    (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) {
- 		if (first) {
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
deleted file mode 100644
index adf75b69cb35..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/dist/configure.in
-+++ b/dist/configure.in
-@@ -105,7 +105,7 @@
- 
- dnl A/UX has a broken getopt(3), strpbrk(3).
- case "$host_os" in
--aux*)	   LIBOBJS="getopt.o strpbrk.o $LIBOBJS";;
-+aux*)	   LIBOBJS="libvi_la-getopt.o libvi_la-strpbrk.o $LIBOBJS";;
- esac
- 
- dnl Ultrix has a broken POSIX.1 VDISABLE value.
-@@ -434,7 +434,7 @@
-         	-e 'ldopts'`
- 	perlldflags=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
-         	-e 'ccdlflags'`
--	LIBOBJS="perl.o perlxsi.o perlsfio.o $LIBOBJS"
-+	LIBOBJS="libvi_la-perl.o libvi_la-perlxsi.o libvi_la-perlsfio.o $LIBOBJS"
- 	AC_DEFINE(HAVE_PERL_INTERP)
- 	AC_CACHE_CHECK([whether we need to use perl's setenv], 
- 		vi_cv_perl_setenv, [
-@@ -471,7 +471,7 @@
- 		AC_MSG_ERROR([No Tcl library found;])
- 	fi
- 	. $vi_cv_tclconfig
--	LIBOBJS="tcl.o $LIBOBJS"
-+	LIBOBJS="libvi_la-tcl.o $LIBOBJS"
- 	LIBS="$TCL_LIB_SPEC $TCL_LIBS $LIBS"
- 	AC_DEFINE(HAVE_TCL_INTERP)
- fi
-@@ -607,12 +607,12 @@
- 
- dnl If we needed setenv or unsetenv, add in the clib/env.c replacement file.
- if test "$need_env" = yes; then
--	LIBOBJS="env.o $LIBOBJS"
-+	LIBOBJS="libvi_la-env.o $LIBOBJS"
- fi
- 
- dnl If we need strsep, add it and define it so we get a prototype.
- if test "$need_strsep" = yes; then
--	LIBOBJS="strsep.o $LIBOBJS"
-+	LIBOBJS="libvi_la-strsep.o $LIBOBJS"
- fi
- 
- dnl Check for fcntl/flock
-@@ -1003,7 +1003,7 @@
- 	PATH="$OLDPATH"
- 
- 	AC_DEFINE(USE_DYNAMIC_LOADING)
--	LIBOBJS="dldb.o $LIBOBJS"
-+	LIBOBJS="libvi_la-dldb.o $LIBOBJS"
- 	dl_src=../common/dldb.c
- 	LIBS="-ldl $LIBS"
- else
-@@ -1046,9 +1046,9 @@
- 	CPPFLAGS="-I$vi_cv_dbsrc/include_auto $CPPFLAGS"
- 	CPPFLAGS="-I$with_db_build $CPPFLAGS"
- 	AC_DEFINE(USE_DB4_LOGGING)
--	LIBOBJS="log4.o vi_auto.o vi_rec.o $LIBOBJS"
-+	LIBOBJS="libvi_la-log4.o libvi_la-vi_auto.o libvi_la-vi_rec.o $LIBOBJS"
- else
--	LIBOBJS="log.o $LIBOBJS"
-+	LIBOBJS="libvi_la-log.o $LIBOBJS"
- fi
- 
- dnl We compile in nvi's RE routines unless the user specifies otherwise.
-@@ -1064,7 +1064,7 @@
- case "$vi_cv_re_lib" in
- "bundled RE")
- 	CPPFLAGS="-I\$(visrcdir)/regex $CPPFLAGS"
--	LIBOBJS="regcomp.o regerror.o regexec.o regfree.o $LIBOBJS";;
-+	LIBOBJS="libvi_la-regcomp.o libvi_la-regerror.o libvi_la-regexec.o libvi_la-regfree.o $LIBOBJS";;
- "other RE")
- 	;;
- esac
---- a/dist/Makefile.am
-+++ b/dist/Makefile.am
-@@ -169,12 +169,15 @@
- 	$(visrcdir)/common/pthread.c \
- 	$(visrcdir)/common/vi_auto.c \
- 	$(visrcdir)/common/vi_rec.c \
--	$(visrcdir)/perl_api/perl.xs \
-+	perl.c \
- 	$(visrcdir)/perl_api/perlsfio.c \
-+	perlxsi.c \
- 	$(visrcdir)/tcl_api/tcl.c
- # Is this the way to do it ?
- libvi_la_DEPENDENCIES = @LTLIBOBJS@
--libvi_la_LIBADD = @LTLIBOBJS@
-+libvi_la_LIBADD = @LTLIBOBJS@ @perllibs@
-+libvi_la_CPPFLAGS = @perlldflags@ $(AM_CPPFLAGS)
-+libvi_la_LDFLAGS = @perlldflags@
- 
- bin_PROGRAMS = @vi_programs@ @vi_ipc@
- EXTRA_PROGRAMS = vi vi-ipc vi-motif vi-gtk
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
deleted file mode 100644
index 3567646688e7..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/perl_api/perlsfio.c
-+++ b/perl_api/perlsfio.c
-@@ -32,6 +32,7 @@
- /* perl redefines them
-  * avoid warnings
-  */
-+#undef re_compile
- #undef USE_DYNAMIC_LOADING
- #undef DEBUG
- #undef PACKAGE
---- a/perl_api/perl.xs
-+++ b/perl_api/perl.xs
-@@ -38,6 +38,7 @@
- /* perl redefines them
-  * avoid warnings
-  */
-+#undef re_compile
- #undef USE_DYNAMIC_LOADING
- #undef DEBUG
- #undef PACKAGE
diff --git a/app-editors/nvi/files/nvi-1.81.6-printf-types.patch b/app-editors/nvi/files/nvi-1.81.6-printf-types.patch
deleted file mode 100644
index 20fc47c18f25..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-printf-types.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-lno and last are uint32_t which might be different from unsigned long
-
---- a/common/msg.c
-+++ b/common/msg.c
-@@ -640,7 +640,8 @@ msgq_status(SCR *sp, db_recno_t lno, u_i
- 			p += len;
- 		} else {
- 			t = msg_cat(sp, "027|line %lu of %lu [%ld%%]", &len);
--			(void)sprintf(p, t, lno, last, (lno * 100) / last);
-+			(void)sprintf(p, t, (u_long)lno, (u_long)last,
-+					((long)lno * 100L) / (long)last);
- 			p += strlen(p);
- 		}
- 	} else {
diff --git a/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch b/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch
deleted file mode 100644
index 70a47fd93fd5..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch
+++ /dev/null
@@ -1,499 +0,0 @@
-Created by: Karl Hakimian 
-Added by: Jesus Rivero <neurogeek@gentoo.org>
-Added on: Feb 18, 2015
-diff -rupN nvi-1.81.6.orig/common/api.c nvi-1.81.6/common/api.c
---- nvi-1.81.6.orig/common/api.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/api.c	2015-02-17 11:04:50.199111784 -0800
-@@ -423,7 +423,7 @@ api_opts_get(SCR *sp, CHAR_T *name, char
- 	switch (op->type) {
- 	case OPT_0BOOL:
- 	case OPT_1BOOL:
--		MALLOC_RET(sp, *value, char *, STRLEN(op->name) + 2 + 1);
-+		MALLOC_RET(sp, *value, char *, NVI_STRLEN(op->name) + 2 + 1);
- 		(void)sprintf(*value,
- 		    "%s"WS, O_ISSET(sp, offset) ? "" : "no", op->name);
- 		if (boolvalue != NULL)
-diff -rupN nvi-1.81.6.orig/common/msg.c nvi-1.81.6/common/msg.c
---- nvi-1.81.6.orig/common/msg.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/msg.c	2015-02-17 11:04:50.203891722 -0800
-@@ -378,7 +378,7 @@ msgq_wstr(SCR *sp, mtype_t mtype, CHAR_T
- 		msgq(sp, mtype, fmt);
- 		return;
- 	}
--	INT2CHAR(sp, str, STRLEN(str) + 1, nstr, nlen);
-+	INT2CHAR(sp, str, NVI_STRLEN(str) + 1, nstr, nlen);
- 	msgq_str(sp, mtype, nstr, fmt);
- }
- 
-diff -rupN nvi-1.81.6.orig/common/multibyte.h nvi-1.81.6/common/multibyte.h
---- nvi-1.81.6.orig/common/multibyte.h	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/multibyte.h	2015-02-17 11:04:50.204262910 -0800
-@@ -12,7 +12,7 @@ typedef	wchar_t		CHAR_T;
- typedef	u_int		UCHAR_T;
- #define RCHAR_BIT	24
- 
--#define STRLEN		wcslen
-+#define NVI_STRLEN		wcslen
- #define STRTOL		wcstol
- #define STRTOUL		wcstoul
- #define SPRINTF		swprintf
-@@ -31,7 +31,7 @@ typedef	u_char		CHAR_T;
- typedef	u_char		UCHAR_T;
- #define RCHAR_BIT	CHAR_BIT
- 
--#define STRLEN		strlen
-+#define NVI_STRLEN		strlen
- #define STRTOL		strtol
- #define STRTOUL		strtoul
- #define SPRINTF		snprintf
-diff -rupN nvi-1.81.6.orig/common/options.c nvi-1.81.6/common/options.c
---- nvi-1.81.6.orig/common/options.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/options.c	2015-02-17 11:04:50.195900457 -0800
-@@ -315,7 +315,7 @@ opts_init(SCR *sp, int *oargs)
- 
- 	/* Set numeric and string default values. */
- #define	OI(indx, str) {							\
--	a.len = STRLEN(str);						\
-+	a.len = NVI_STRLEN(str);						\
- 	if ((CHAR_T*)str != b2)	  /* GCC puts strings in text-space. */	\
- 		(void)MEMCPY(b2, str, a.len+1);				\
- 	if (opts_set(sp, argv, NULL)) {					\
-@@ -620,10 +620,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
- 				goto badnum;
- 			if ((nret =
- 			    nget_uslong(sp, &value, sep, &endp, 10)) != NUM_OK) {
--				INT2CHAR(sp, name, STRLEN(name) + 1, 
-+				INT2CHAR(sp, name, NVI_STRLEN(name) + 1, 
- 					     np, nlen);
- 				p2 = msg_print(sp, np, &nf);
--				INT2CHAR(sp, sep, STRLEN(sep) + 1, 
-+				INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, 
- 					     np, nlen);
- 				t2 = msg_print(sp, np, &nf2);
- 				switch (nret) {
-@@ -647,10 +647,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
- 				break;
- 			}
- 			if (*endp && !ISBLANK(*endp)) {
--badnum:				INT2CHAR(sp, name, STRLEN(name) + 1, 
-+badnum:				INT2CHAR(sp, name, NVI_STRLEN(name) + 1, 
- 					     np, nlen);
- 				p2 = msg_print(sp, np, &nf);
--				INT2CHAR(sp, sep, STRLEN(sep) + 1, 
-+				INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, 
- 					     np, nlen);
- 				t2 = msg_print(sp, np, &nf2);
- 				msgq(sp, M_ERR,
-@@ -680,7 +680,7 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
- 				break;
- 
- 			/* Report to subsystems. */
--			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
-+			INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
- 			if (op->func != NULL &&
- 			    op->func(sp, spo, np, &value) ||
- 			    ex_optchange(sp, offset, np, &value) ||
-@@ -712,7 +712,7 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
- 			 * Do nothing if the value is unchanged, the underlying
- 			 * functions can be expensive.
- 			 */
--			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
-+			INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
- 			if (!F_ISSET(op, OPT_ALWAYS) &&
- 			    O_STR(sp, offset) != NULL &&
- 			    !strcmp(O_STR(sp, offset), np))
-@@ -879,7 +879,7 @@ opts_dump(SCR *sp, enum optdisp type)
- 		}
- 		F_CLR(&sp->opts[cnt], OPT_SELECTED);
- 
--		curlen = STRLEN(op->name);
-+		curlen = NVI_STRLEN(op->name);
- 		switch (op->type) {
- 		case OPT_0BOOL:
- 		case OPT_1BOOL:
-@@ -1049,7 +1049,7 @@ opts_search(CHAR_T *name)
- 	 * Check to see if the name is the prefix of one (and only one)
- 	 * option.  If so, return the option.
- 	 */
--	len = STRLEN(name);
-+	len = NVI_STRLEN(name);
- 	for (found = NULL, op = optlist; op->name != NULL; ++op) {
- 		if (op->name[0] < name[0])
- 			continue;
-diff -rupN nvi-1.81.6.orig/dist/tags nvi-1.81.6/dist/tags
---- nvi-1.81.6.orig/dist/tags	2007-11-18 08:43:55.000000000 -0800
-+++ nvi-1.81.6/dist/tags	2015-02-17 11:04:50.225314084 -0800
-@@ -1068,8 +1068,8 @@ SPRINTF	../common/multibyte.h	37;"	d
- STANDARD_TAB	../common/key.h	213;"	d
- STRCMP	../common/multibyte.h	19;"	d
- STRCMP	../common/multibyte.h	38;"	d
--STRLEN	../common/multibyte.h	15;"	d
--STRLEN	../common/multibyte.h	34;"	d
-+NVI_STRLEN	../common/multibyte.h	15;"	d
-+NVI_STRLEN	../common/multibyte.h	34;"	d
- STRPBRK	../common/multibyte.h	20;"	d
- STRPBRK	../common/multibyte.h	39;"	d
- STRSET	../common/multibyte.h	22;"	d
-diff -rupN nvi-1.81.6.orig/ex/ex_argv.c nvi-1.81.6/ex/ex_argv.c
---- nvi-1.81.6.orig/ex/ex_argv.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_argv.c	2015-02-17 11:04:50.267171388 -0800
-@@ -217,7 +217,7 @@ argv_exp2(SCR *sp, EXCMD *excp, CHAR_T *
- 
- 			*p = '\0';
- 			INT2CHAR(sp, bp + SHELLOFFSET, 
--				 STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
-+				 NVI_STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
- 			d = strdup(np);
- 			rval = argv_lexp(sp, excp, d);
- 			free (d);
-@@ -332,7 +332,7 @@ argv_fexp(SCR *sp, EXCMD *excp, CHAR_T *
- 				    "115|No previous command to replace \"!\"");
- 				return (1);
- 			}
--			len += tlen = STRLEN(exp->lastbcomm);
-+			len += tlen = NVI_STRLEN(exp->lastbcomm);
- 			off = p - bp;
- 			ADD_SPACE_RETW(sp, bp, blen, len);
- 			p = bp + off;
-@@ -683,7 +683,7 @@ err:		if (ifp != NULL)
- 		 * XXX
- 		 * Assume that all shells have -c.
- 		 */
--		INT2CHAR(sp, bp, STRLEN(bp)+1, np, nlen);
-+		INT2CHAR(sp, bp, NVI_STRLEN(bp)+1, np, nlen);
- 		execl(sh_path, sh, "-c", np, (char *)NULL);
- 		msgq_str(sp, M_SYSERR, sh_path, "118|Error: execl: %s");
- 		_exit(127);
-diff -rupN nvi-1.81.6.orig/ex/ex_cscope.c nvi-1.81.6/ex/ex_cscope.c
---- nvi-1.81.6.orig/ex/ex_cscope.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_cscope.c	2015-02-17 11:04:50.261539058 -0800
-@@ -140,7 +140,7 @@ ex_cscope(SCR *sp, EXCMD *cmdp)
- 		for (; *p && isspace(*p); ++p);
- 	}
- 
--	INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
-+	INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
- 	if ((ccp = lookup_ccmd(np)) == NULL) {
- usage:		msgq(sp, M_ERR, "309|Use \"cscope help\" for help");
- 		return (1);
-@@ -214,7 +214,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
- 	 * >1 additional args: object, too many args.
- 	 */
- 	cur_argc = cmdp->argc;
--	if (argv_exp2(sp, cmdp, dname, STRLEN(dname))) {
-+	if (argv_exp2(sp, cmdp, dname, NVI_STRLEN(dname))) {
- 		return (1);
- 	}
- 	if (cmdp->argc == cur_argc) {
-@@ -228,7 +228,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
- 		return (1);
- 	}
- 
--	INT2CHAR(sp, dname, STRLEN(dname)+1, np, nlen);
-+	INT2CHAR(sp, dname, NVI_STRLEN(dname)+1, np, nlen);
- 
- 	/*
- 	 * The user can specify a specific file (so they can have multiple
-@@ -471,7 +471,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, CHAR_T
- 	}
- 
- 	/* Create the cscope command. */
--	INT2CHAR(sp, pattern, STRLEN(pattern) + 1, np, nlen);
-+	INT2CHAR(sp, pattern, NVI_STRLEN(pattern) + 1, np, nlen);
- 	np = strdup(np);
- 	if ((tqp = create_cs_cmd(sp, np, &search)) == NULL)
- 		goto err;
-@@ -801,7 +801,7 @@ cscope_help(SCR *sp, EXCMD *cmdp, CHAR_T
- 	char *np;
- 	size_t nlen;
- 
--	INT2CHAR(sp, subcmd, STRLEN(subcmd) + 1, np, nlen);
-+	INT2CHAR(sp, subcmd, NVI_STRLEN(subcmd) + 1, np, nlen);
- 	return (csc_help(sp, np));
- }
- 
-@@ -842,7 +842,7 @@ cscope_kill(SCR *sp, EXCMD *cmdp, CHAR_T
- 	char *np;
- 	size_t nlen;
- 
--	INT2CHAR(sp, cn, STRLEN(cn) + 1, np, nlen);
-+	INT2CHAR(sp, cn, NVI_STRLEN(cn) + 1, np, nlen);
- 	return (terminate(sp, NULL, atoi(np)));
- }
- 
-diff -rupN nvi-1.81.6.orig/ex/ex_filter.c nvi-1.81.6/ex/ex_filter.c
---- nvi-1.81.6.orig/ex/ex_filter.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_filter.c	2015-02-17 11:04:50.263257613 -0800
-@@ -138,7 +138,7 @@ err:		if (input[0] != -1)
- 		else
- 			++name;
- 
--		INT2SYS(sp, cmd, STRLEN(cmd)+1, np, nlen);
-+		INT2SYS(sp, cmd, NVI_STRLEN(cmd)+1, np, nlen);
- 		execl(O_STR(sp, O_SHELL), name, "-c", np, (char *)NULL);
- 		msgq_str(sp, M_SYSERR, O_STR(sp, O_SHELL), "execl: %s");
- 		_exit (127);
-@@ -283,7 +283,7 @@ err:		if (input[0] != -1)
- 	 * Ignore errors on vi file reads, to make reads prettier.  It's
- 	 * completely inconsistent, and historic practice.
- 	 */
--uwait:	INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
-+uwait:	INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
- 	return (proc_wait(sp, (long)utility_pid, np,
- 	    ftype == FILTER_READ && F_ISSET(sp, SC_VI) ? 1 : 0, 0) || rval);
- }
-diff -rupN nvi-1.81.6.orig/ex/ex_init.c nvi-1.81.6/ex/ex_init.c
---- nvi-1.81.6.orig/ex/ex_init.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_init.c	2015-02-17 11:04:50.279419412 -0800
-@@ -61,7 +61,7 @@ ex_screen_copy(SCR *orig, SCR *sp)
- 
- 		if (oexp->lastbcomm != NULL &&
- 		    (nexp->lastbcomm = v_wstrdup(sp, oexp->lastbcomm, 
--				     STRLEN(oexp->lastbcomm))) == NULL) {
-+				     NVI_STRLEN(oexp->lastbcomm))) == NULL) {
- 			msgq(sp, M_SYSERR, NULL);
- 			return(1);
- 		}
-diff -rupN nvi-1.81.6.orig/ex/ex_tag.c nvi-1.81.6/ex/ex_tag.c
---- nvi-1.81.6.orig/ex/ex_tag.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_tag.c	2015-02-17 11:04:50.275254557 -0800
-@@ -68,7 +68,7 @@ ex_tag_first(SCR *sp, CHAR_T *tagarg)
- 
- 	/* Build an argument for the ex :tag command. */
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
--	argv_exp0(sp, &cmd, tagarg, STRLEN(tagarg));
-+	argv_exp0(sp, &cmd, tagarg, NVI_STRLEN(tagarg));
- 
- 	/*
- 	 * XXX
-@@ -115,7 +115,7 @@ ex_tag_push(SCR *sp, EXCMD *cmdp)
- 
- 		/* Taglength may limit the number of characters. */
- 		if ((tl =
--		    O_VAL(sp, O_TAGLENGTH)) != 0 && STRLEN(exp->tag_last) > tl)
-+		    O_VAL(sp, O_TAGLENGTH)) != 0 && NVI_STRLEN(exp->tag_last) > tl)
- 			exp->tag_last[tl] = '\0';
- 		break;
- 	case 0:
-@@ -587,7 +587,7 @@ ex_tag_copy(SCR *orig, SCR *sp)
- 	/* Copy the last tag. */
- 	if (oexp->tag_last != NULL &&
- 	    (nexp->tag_last = v_wstrdup(sp, oexp->tag_last, 
--					STRLEN(oexp->tag_last))) == NULL) {
-+					NVI_STRLEN(oexp->tag_last))) == NULL) {
- 		msgq(sp, M_SYSERR, NULL);
- 		return (1);
- 	}
-@@ -997,7 +997,7 @@ ctag_slist(SCR *sp, CHAR_T *tag)
- 	exp = EXP(sp);
- 
- 	/* Allocate and initialize the tag queue structure. */
--	INT2CHAR(sp, tag, STRLEN(tag) + 1, np, nlen);
-+	INT2CHAR(sp, tag, NVI_STRLEN(tag) + 1, np, nlen);
- 	len = nlen - 1;
- 	CALLOC_GOTO(sp, tqp, TAGQ *, 1, sizeof(TAGQ) + len + 1);
- 	CIRCLEQ_INIT(&tqp->tagq);
-diff -rupN nvi-1.81.6.orig/ex/ex_util.c nvi-1.81.6/ex/ex_util.c
---- nvi-1.81.6.orig/ex/ex_util.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_util.c	2015-02-17 11:04:50.268378054 -0800
-@@ -153,7 +153,7 @@ ex_wemsg(SCR* sp, CHAR_T *p, exm_t which
- 	char *np;
- 	size_t nlen;
- 
--	if (p) INT2CHAR(sp, p, STRLEN(p), np, nlen);
-+	if (p) INT2CHAR(sp, p, NVI_STRLEN(p), np, nlen);
- 	else np = NULL;
- 	ex_emsg(sp, np, which);
- }
-diff -rupN nvi-1.81.6.orig/ex/ex_write.c nvi-1.81.6/ex/ex_write.c
---- nvi-1.81.6.orig/ex/ex_write.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_write.c	2015-02-17 11:04:50.277249383 -0800
-@@ -158,7 +158,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
- 			ex_emsg(sp, cmdp->cmd->usage, EXM_USAGE);
- 			return (1);
- 		}
--		if (argv_exp1(sp, cmdp, p, STRLEN(p), 1))
-+		if (argv_exp1(sp, cmdp, p, NVI_STRLEN(p), 1))
- 			return (1);
- 
- 		/*
-@@ -203,7 +203,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
- 		    &cmdp->addr1, &cmdp->addr2, NULL, flags));
- 
- 	/* Build an argv so we get an argument count and file expansion. */
--	if (argv_exp2(sp, cmdp, p, STRLEN(p)))
-+	if (argv_exp2(sp, cmdp, p, NVI_STRLEN(p)))
- 		return (1);
- 
- 	/*
-@@ -255,7 +255,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
- 			set_alt_name(sp, name);
- 		break;
- 	default:
--		INT2CHAR(sp, p, STRLEN(p) + 1, n, nlen);
-+		INT2CHAR(sp, p, NVI_STRLEN(p) + 1, n, nlen);
- 		ex_emsg(sp, n, EXM_FILECOUNT);
- 		return (1);
- 	}
-diff -rupN nvi-1.81.6.orig/ip/ip_term.c nvi-1.81.6/ip/ip_term.c
---- nvi-1.81.6.orig/ip/ip_term.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ip/ip_term.c	2015-02-17 11:04:50.280203225 -0800
-@@ -127,7 +127,7 @@ ip_optchange(SCR *sp, int offset, char *
- 
- 	ipb.code = SI_EDITOPT;
- 	ipb.str1 = (char*)opt->name;
--	ipb.len1 = STRLEN(opt->name) * sizeof(CHAR_T);
-+	ipb.len1 = NVI_STRLEN(opt->name) * sizeof(CHAR_T);
- 
- 	(void)vi_send(ipp->o_fd, "ab1", &ipb);
- 	return (0);
-diff -rupN nvi-1.81.6.orig/perl_api/perl.xs nvi-1.81.6/perl_api/perl.xs
---- nvi-1.81.6.orig/perl_api/perl.xs	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/perl_api/perl.xs	2015-02-17 11:04:50.189684363 -0800
-@@ -326,7 +326,7 @@ perl_ex_perl(scrp, cmdp, cmdlen, f_lno,
- 	newVIrv(pp->svid, scrp);
- 
- 	istat = signal(SIGINT, my_sighandler);
--	INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
-+	INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
- 	perl_eval(np);
- 	signal(SIGINT, istat);
- 
-@@ -421,7 +421,7 @@ perl_ex_perldo(scrp, cmdp, cmdlen, f_lno
- 	/* Backwards compatibility. */
- 	newVIrv(pp->svid, scrp);
- 
--	INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
-+	INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
- 	if (!(command = malloc(length = nlen - 1 + sizeof("sub {}"))))
- 		return 1;
- 	snprintf(command, length, "sub {%s}", np);
-diff -rupN nvi-1.81.6.orig/regex/engine.c nvi-1.81.6/regex/engine.c
---- nvi-1.81.6.orig/regex/engine.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/regex/engine.c	2015-02-17 11:04:50.181456859 -0800
-@@ -161,7 +161,7 @@ int eflags;
- 		stop = string + pmatch[0].rm_eo;
- 	} else {
- 		start = string;
--		stop = start + STRLEN(start);
-+		stop = start + NVI_STRLEN(start);
- 	}
- 	if (stop < start)
- 		return(REG_INVARG);
-diff -rupN nvi-1.81.6.orig/regex/regcomp.c nvi-1.81.6/regex/regcomp.c
---- nvi-1.81.6.orig/regex/regcomp.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/regex/regcomp.c	2015-02-17 11:04:50.175705539 -0800
-@@ -198,7 +198,7 @@ regcomp(regex_t *preg, const RCHAR_T *pa
- 			return(REG_INVARG);
- 		len = preg->re_endp - pattern;
- 	} else
--		len = STRLEN(pattern);
-+		len = NVI_STRLEN(pattern);
- 
- 	/* do the mallocs early so failure handling is easy */
- 	g = (struct re_guts *)malloc(sizeof(struct re_guts) +
-@@ -818,7 +818,7 @@ p_b_cclass(register struct parse *p, reg
- 		NEXT();
- 	len = p->next - sp;
- 	for (cp = cclasses; cp->name != NULL; cp++)
--		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
-+		if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
- 			break;
- 	if (cp->name == NULL) {
- 		/* oops, didn't find it */
-@@ -889,7 +889,7 @@ p_b_coll_elem(register struct parse *p,
- 	}
- 	len = p->next - sp;
- 	for (cp = cnames; cp->name != NULL; cp++)
--		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
-+		if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
- 			return(cp->code);	/* known name */
- 	if (len == 1)
- 		return(*sp);	/* single character */
-diff -rupN nvi-1.81.6.orig/vi/v_event.c nvi-1.81.6/vi/v_event.c
---- nvi-1.81.6.orig/vi/v_event.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/v_event.c	2015-02-17 11:04:50.242966563 -0800
-@@ -97,7 +97,7 @@ v_editopt(SCR *sp, VICMD *vp)
- 	size_t nlen;
- 	char *p2;
- 
--	INT2CHAR(sp, vp->ev.e_str2, STRLEN(vp->ev.e_str2)+1, np, nlen);
-+	INT2CHAR(sp, vp->ev.e_str2, NVI_STRLEN(vp->ev.e_str2)+1, np, nlen);
- 	p2 = strdup(np);
- 	rval = api_opts_set(sp, vp->ev.e_str1, p2, 
- 			    vp->ev.e_val1, vp->ev.e_val1);
-@@ -135,7 +135,7 @@ v_tag(SCR *sp, VICMD *vp)
- 		return (1);
- 
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
--	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
-+	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
- 	return (v_exec_ex(sp, vp, &cmd));
- }
- 
-@@ -167,7 +167,7 @@ v_tagsplit(SCR *sp, VICMD *vp)
- 
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
- 	F_SET(&cmd, E_NEWSCREEN);
--	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
-+	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
- 	return (v_exec_ex(sp, vp, &cmd));
- }
- 
-diff -rupN nvi-1.81.6.orig/vi/v_ex.c nvi-1.81.6/vi/v_ex.c
---- nvi-1.81.6.orig/vi/v_ex.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/v_ex.c	2015-02-17 11:04:50.246380280 -0800
-@@ -210,7 +210,7 @@ v_tagpush(SCR *sp, VICMD *vp)
- 	EXCMD cmd;
- 
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, 0, 0);
--	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw) + 1);
-+	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw) + 1);
- 	return (v_exec_ex(sp, vp, &cmd));
- }
- 
-diff -rupN nvi-1.81.6.orig/vi/vs_msg.c nvi-1.81.6/vi/vs_msg.c
---- nvi-1.81.6.orig/vi/vs_msg.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/vs_msg.c	2015-02-17 11:04:50.251093618 -0800
-@@ -175,7 +175,7 @@ vs_update(SCR *sp, const char *m1, const
- 	 */
- 	if (F_ISSET(sp, SC_SCR_EXWROTE)) {
- 		if (m2 != NULL)
--			INT2CHAR(sp, m2, STRLEN(m2) + 1, np, nlen);
-+			INT2CHAR(sp, m2, NVI_STRLEN(m2) + 1, np, nlen);
- 		(void)ex_printf(sp,
- 		    "%s\n", m1 == NULL? "" : m1, m2 == NULL ? "" : np);
- 		(void)ex_fflush(sp);
-@@ -203,7 +203,7 @@ vs_update(SCR *sp, const char *m1, const
- 	} else
- 		len = 0;
- 	if (m2 != NULL) {
--		mlen = STRLEN(m2);
-+		mlen = NVI_STRLEN(m2);
- 		if (len + mlen > sp->cols - 2)
- 			mlen = (sp->cols - 2) - len;
- 		(void)gp->scr_waddstr(sp, m2, mlen);
-diff -rupN nvi-1.81.6.orig/vi/vs_split.c nvi-1.81.6/vi/vs_split.c
---- nvi-1.81.6.orig/vi/vs_split.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/vs_split.c	2015-02-17 11:04:50.256136584 -0800
-@@ -628,7 +628,7 @@ vs_fg(SCR *sp, SCR **nspp, CHAR_T *name,
- 	wp = sp->wp;
- 
- 	if (name)
--	    INT2CHAR(sp, name, STRLEN(name) + 1, np, nlen);
-+	    INT2CHAR(sp, name, NVI_STRLEN(name) + 1, np, nlen);
- 	else
- 	    np = NULL;
- 	if (newscreen)
-diff -rupN nvi-1.81.6.orig/vi/v_txt.c nvi-1.81.6/vi/v_txt.c
---- nvi-1.81.6.orig/vi/v_txt.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/v_txt.c	2015-02-17 11:04:50.240596567 -0800
-@@ -2049,7 +2049,7 @@ retry:		for (len = 0,
- 		return (0);
- 	case 1:				/* One match. */
- 		/* If something changed, do the exchange. */
--		nlen = STRLEN(cmd.argv[0]->bp);
-+		nlen = NVI_STRLEN(cmd.argv[0]->bp);
- 		if (len != nlen || MEMCMP(cmd.argv[0]->bp, p, len))
- 			break;
- 
diff --git a/app-editors/nvi/files/nvi-1.81.6-use_pkgconfig_for_ncurses.patch b/app-editors/nvi/files/nvi-1.81.6-use_pkgconfig_for_ncurses.patch
deleted file mode 100644
index a9bf7e0a06a4..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-use_pkgconfig_for_ncurses.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -uNr nvi-1.81.6.orig/dist/configure.in nvi-1.81.6/dist/configure.in
---- nvi-1.81.6.orig/dist/configure.in	2013-07-09 17:17:35.000000000 -0400
-+++ nvi-1.81.6/dist/configure.in	2013-07-09 17:18:48.000000000 -0400
-@@ -263,11 +263,13 @@
- 	[  --enable-gtk            Build a Gtk front-end for vi.],
- 	[vi_cv_gtk=$enableval], [vi_cv_gtk="no"])
- AC_MSG_RESULT($vi_cv_gtk)
-+
-+#
-+# Find pkg-config
-+#
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
- if test "$vi_cv_gtk" = "yes"; then
--	#
--	# Find pkg-config
--	#
--	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- 	if test x$PKG_CONFIG = xno ; then
- 	    if test "$vi_cv_widechar" = "yes"; then
- 	        AC_MSG_ERROR(
-@@ -531,7 +533,7 @@
- 			[CURSHEADER=ncursesw/ncurses.h])
- 	    fi
- 	    vi_programs="vi $vi_programs"
--	    CURSLIBS="-l$vi_cv_curses"
-+	    CURSLIBS=`$PKG_CONFIG --libs $vi_cv_curses`
- 	else
- 	    AC_MSG_WARN([*** No suitable curses library found.])
- 	    if test "$vi_programs"X = X; then
diff --git a/app-editors/nvi/metadata.xml b/app-editors/nvi/metadata.xml
deleted file mode 100644
index f954e7f9956d..000000000000
--- a/app-editors/nvi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>felix.janda@posteo.de</email>
-		<name>Felix Janda</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
deleted file mode 100644
index cc7f7301612c..000000000000
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use flag-o-matic
-
-DESCRIPTION="Re-implementation of the classic 4BSD ex/vi"
-HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
-SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
-IUSE="perl tcl unicode"
-
-CDEPEND=">=sys-libs/db-4.2.52_p5:=
-	>=sys-libs/ncurses-5.6-r2:=
-	perl? ( dev-lang/perl )
-	tcl? ( >=dev-lang/tcl-8.5:0= )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	app-eselect/eselect-vi"
-
-REQUIRED_USE="tcl? ( !unicode )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-strlen-macro-renaming.patch
-	"${FILESDIR}"/${P}-db44.patch
-	"${FILESDIR}"/${P}-db.patch
-	"${FILESDIR}"/${P}-perl-as-needed.patch
-	"${FILESDIR}"/${P}-perl-shortnames.patch
-	"${FILESDIR}"/${P}-ac_config_header.patch
-	"${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
-	"${FILESDIR}"/${P}-printf-types.patch
-	)
-
-src_prepare() {
-	default
-
-	cd dist || die
-	chmod +x findconfig || die
-
-	mv configure.{in,ac} || die
-	sed -i -e "s@-ldb@-l$(db_libname)@" configure.ac || die
-	sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die
-	eautoreconf -Im4
-}
-
-src_configure() {
-	local myconf
-
-	use perl && myconf="${myconf} --enable-perlinterp"
-	use unicode && myconf="${myconf} --enable-widechar"
-	use tcl && myconf="${myconf} --enable-tclinterp"
-
-	append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX}/usr/share/vi/catalog/\\\"\""
-	append-cppflags -I"$(db_includedir)"
-
-	# Darwin doesn't have stropts.h, bug #619416
-	[[ ${CHOST} == *-darwin* ]] && export vi_cv_sys5_pty=no
-
-	pushd dist 2>/dev/null || die
-	econf \
-		--program-prefix=n \
-		${myconf}
-	popd 2>/dev/null || die
-}
-
-src_compile() {
-	emake -C dist
-}
-
-src_install() {
-	emake -C dist DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 8b39da77270e..90ff951ea773 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,9 @@
 DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
 DIST pluma-1.22.1.tar.xz 3236724 BLAKE2B f571ccb79ffac11122dad1888a9804fdb1671f2c73b28c216e0ec593ffc4dac3fec3053b83fd1503e0c951e032f6e4c22fb4f3d6a1d23477a54e06de2659222e SHA512 0d3f07b2e8c736c9e1ad64ed5cb749db6088868e9bc27aa786cbb0c3fe72715f0fd4dd53999502a4333ec82110148b772c0dde81433d0936d2d3c2d04804026a
-EBUILD pluma-1.22.0.ebuild 1745 BLAKE2B 5c69aac384e3084b053e93138636e3a9ebc4f60da1ec4792258c4431ef0546161dca7e47a3d3ff29a05e0d6a4c2ef7a9e8063ee74d66408b661bff29ed14c785 SHA512 e371c4c8438759c3cd4fd69053115e20e19ff4537be2093e86f77333318ba004d3f996d9d8185fd063ced5402ababb7216c609680b8e0209665057a7ec2dac94
-EBUILD pluma-1.22.1.ebuild 1747 BLAKE2B 8c14be924bec494258f729557695d684c6b44c44b57630982e214d14270d6562b54da74c73f8adf68a06cd6bb5d0e6cc867d6db1b29968ee6c40ca76d998ec71 SHA512 c1b44789912904af1a5e1e3a387afe3997ab6a0a862b0588f41cee7ea258cf834a77f8c1bb3dac6ec4ff93ccfd29064f160aea8560f92a77c0e0500f3b65c553
+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.0.ebuild 1763 BLAKE2B 09f76235925231ec9870fbd03395360fc0b2bac151fd0eb066e3effc5756cb7279cee91eff39f2cab8d0374d6f6d77cfcefd11e73df7575e096a858d6e8421a3 SHA512 dc581d061d7bd028ba87dfa42f8eb7268e11fc23f154ffd312ce59236ab844f4afa60256b348b72365f98e05b01d309024858c2f3aed67efb6a32eb6a447e93a
+EBUILD pluma-1.22.1.ebuild 1765 BLAKE2B 97f2a1f30a065b3f558afbfbc99be24413ace4a065f18d1932ac19734a7b9d1e4a3c859fcca03e480f4cdb8b32e5b01a7234787427b1a97e8fb266e4dd102728 SHA512 b85dcb81da527d971f1238e47688556907a7312a6967b2facea11108c521b1d5618120d39eb3ad77f8eab1fad11ae6e1a3dc288912aa943f486f38144d81e8ca
+EBUILD pluma-1.22.2.ebuild 1765 BLAKE2B 97f2a1f30a065b3f558afbfbc99be24413ace4a065f18d1932ac19734a7b9d1e4a3c859fcca03e480f4cdb8b32e5b01a7234787427b1a97e8fb266e4dd102728 SHA512 b85dcb81da527d971f1238e47688556907a7312a6967b2facea11108c521b1d5618120d39eb3ad77f8eab1fad11ae6e1a3dc288912aa943f486f38144d81e8ca
+EBUILD pluma-1.24.0.ebuild 1786 BLAKE2B 595e5ec1f1ae99e70617013274875d23ec1ebc6fd8f6b0abedd9657cd5e2d7178c4a31b6c209f18759fe975efa3e21a118654de4767382d8f5abed366e6f6661 SHA512 46a968a381d9d143fb5a371d8f6ffa9c1b551cfe2f75895ab82e7aba0631edadfbb0f4d9a59b297ac9a1cf4247e0a91768e62fcd9580baaa7839129cb1d6f56c
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.22.0.ebuild b/app-editors/pluma/pluma-1.22.0.ebuild
index 063c79480954..8760273f0a9a 100644
--- a/app-editors/pluma/pluma-1.22.0.ebuild
+++ b/app-editors/pluma/pluma-1.22.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
 IUSE="+introspection spell"
diff --git a/app-editors/pluma/pluma-1.22.1.ebuild b/app-editors/pluma/pluma-1.22.1.ebuild
index 9e1d789c3749..f1278f5501c6 100644
--- a/app-editors/pluma/pluma-1.22.1.ebuild
+++ b/app-editors/pluma/pluma-1.22.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
 IUSE="+introspection spell"
diff --git a/app-editors/pluma/pluma-1.22.2.ebuild b/app-editors/pluma/pluma-1.22.2.ebuild
new file mode 100644
index 000000000000..f1278f5501c6
--- /dev/null
+++ b/app-editors/pluma/pluma-1.22.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection spell"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libSM-1.0
+	x11-libs/pango
+	virtual/libintl
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	spell? (
+		>=app-text/enchant-1.6:=
+		>=app-text/iso-codes-0.35
+	)
+	!!app-editors/mate-text-editor"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[introspection?]"
+
+DEPEND="${COMMON_DEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable introspection) \
+		$(use_enable spell)
+}
+
+src_test() {
+	# FIXME: This should be handled at eclass level.
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
new file mode 100644
index 000000000000..b4b41684ccc9
--- /dev/null
+++ b/app-editors/pluma/pluma-1.24.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit mate python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection spell test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libSM-1.0
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	spell? (
+		>=app-text/enchant-1.6:=
+		>=app-text/iso-codes-0.35
+	)
+	!!app-editors/mate-text-editor
+"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[introspection?]
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	# FIXME: This should be handled at eclass level.
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 767671f89f3f..cf88eaa5f976 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -2,6 +2,8 @@ AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
 DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
+DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
 EBUILD qhexedit2-0.8.4.ebuild 1811 BLAKE2B d11fbd32ead08ad9590438bc2bebbcfee2df2be302a4cdc85fc47f0ff6a54b922cff1a5f2e5ed93eddea36750cce42c419ab959a0d21eed8123003fa1aa441f7 SHA512 9ed9080678cc5bd62c25c250bf62d151faf017871eb42041ddb5563bf2a2f9e89fdb5f67b08ebbab5586d3d635d5e1d7f93cb618d271ab9fe8e579e6d04a02dc
 EBUILD qhexedit2-0.8.4_p20170719.ebuild 1905 BLAKE2B c9f18cdea8959f5817154daf3fbe42e7b72c66246fa3158a8d5f8693a3ac7234fddaf337cc381e9da3ab31767b0e6798d184ec1cea1f79552ea4b03cfaf51078 SHA512 cdc702920e36f4f5b6ad145d40e166d140fe43f2745203b2442ee6d9ae37c36b1fccd58246596bde625ee22607fcfcd9046cb029ff9d60a74e6c07ca6c67ef58
+EBUILD qhexedit2-0.8.6_p20190316.ebuild 1868 BLAKE2B 6fd39f94f8a4d10f873548a66aac1095282a24ff3f21bd3350e590e9d3a5aa2e072418698862f56af77ea854cde02abd6a38f3047cc1f5ef3ec4a4f4f69016c7 SHA512 6db0ecc19a0255d17585233a144470941bbc6b4e9988fb36a3547fad95c7f333bf2bf04ef09292c17fe28f29cd9c79b5e69e9b3876f8640a438d37f9f69d0b08
 MISC metadata.xml 991 BLAKE2B 7faabbd43f1bdebee332845029ceef0824e380b70b7abe2adc9840391bba736941851433d58324886d4821f55ac83c67ff604b32d648acfd4c7e420662c5e155 SHA512 b079492a11df201b941d91991aef6161971ef15f80e7ca3ea71df2a0dbf2f193bc2514502e179321c7f688eb4f129401775bca9d9b657e3eec45e13c4c0948bb
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
new file mode 100644
index 000000000000..2378ef10d4d9
--- /dev/null
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 qmake-utils
+
+EGIT_COMMIT="ba5af8616b3a6c916e718914225a483267c01356"
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/lancos/qhexedit2/"
+SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +gui python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
+)
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
+		-e "\$aINSTALLS += target" src/qhexedit.pro \
+		|| die "src/qhexedit.pro: sed failed"
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	default
+	use python && distutils-r1_src_compile
+	use gui && emake -C example
+}
+
+python_compile() {
+	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
+}
+
+src_test() {
+	cd test || die "can't cd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake5 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	doheader src/*.h
+	use python && distutils-r1_src_install
+	use gui && dobin example/qhexedit
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index f4db17930083..bf0ea0158cdc 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -1,4 +1,4 @@
 DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
-EBUILD sublime-text-3_p3211-r1.ebuild 1648 BLAKE2B 7ef13efe77fa0a21de63f96ce10d0f02d1143f8e1951753fbb1cb93e027824289e4435c69b149d4547138f6eaedb59f45c59f21a6f0d77b908358b13697eb928 SHA512 e8c0fa8667253cc73bdb9f4870eb7ec5780dc88c97b26cd54307366b7a4750d5c24e56a93dd56db36ee5e0b62d738e9634886126f9a512ececfc044399dda32c
+EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
 MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild b/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
index 0ac62feeeccc..97148c436c35 100644
--- a/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
+++ b/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,7 +52,7 @@ src_install() {
 		"TextEditor;IDE;Development" "StartupNotify=true"
 
 	# needed to get WM_CLASS lookup right
-	mv "${ED}"/usr/share/applications/subl{_%F-sublime-text,}.desktop || die
+	mv "${ED}"/usr/share/applications/subl{-sublime-text,}.desktop || die
 }
 
 pkg_postrm() {
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index c2743b2ba743..18b36eb54ddd 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,3 +1,7 @@
 DIST texworks-0.6.3.tar.gz 12082640 BLAKE2B db5b98f9226e0e7e109dc06d8e0a88b0e8f0dd237676ebec3be55308c720eb6dada25be061d8d5dc27949b9673e93fd65c8ddddfbe03aee4f8170471c52b37fd SHA512 389cf54441e74164fc842f2f293cdee45c6ff9fe202f262d32f3fb076de9a29813a62cd75052969293f2f784e0722215bbbf2206e75bc836a13d495bf5aed653
+DIST texworks-0.6.4.tar.gz 12139530 BLAKE2B 48808ba7c868c9f445d902254c4fe7abb4af740b77e227ab3d9d0ced3132129faa885af68811fa6e3c27ede217deacaf062ae4d8ff0f3fe24b066ab1195de96b SHA512 8fa3e16e6ee19d46dba30707e7a83340c1d68f6cb855cc2838c5c168dc580f8973cb7438bdfce93e51962653694d369c51d7a82a07ad6bcf5eb89030fa3640ea
+DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
 EBUILD texworks-0.6.3.ebuild 1387 BLAKE2B fc8cadb7a3cc17ff450705d0925946891b75f0d574d9bed6ce50e5ccd3a739353e522035683d70d877a54511fcf16d43fc4b1c688b4860869b135b2abb3455a8 SHA512 8991744543c3f456733e10e264ef6311312309408162c5daff459c6c5f7067b1abd49b20d5f116d4718b77d10bfa04414a5098a1c6ee6a0933865a9ab88fbc91
+EBUILD texworks-0.6.4.ebuild 1389 BLAKE2B 44410765957d971478149041546d37b753ff6fe038087fee641d983853201f684d3fa144fdd454b2c57f94e1dcec70285fb0183a1091750b71746e9b45eed1e7 SHA512 3105f3ed1df5ae554f508cecf26a03af2fd1195e1ddef474cfff54cf55b3185082015b46caba4536d5f487b0052c1654760922b3c96ed87e025aee9e725784bf
+EBUILD texworks-0.6.5.ebuild 1389 BLAKE2B 44410765957d971478149041546d37b753ff6fe038087fee641d983853201f684d3fa144fdd454b2c57f94e1dcec70285fb0183a1091750b71746e9b45eed1e7 SHA512 3105f3ed1df5ae554f508cecf26a03af2fd1195e1ddef474cfff54cf55b3185082015b46caba4536d5f487b0052c1654760922b3c96ed87e025aee9e725784bf
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.4.ebuild b/app-editors/texworks/texworks-0.6.4.ebuild
new file mode 100644
index 000000000000..5a37d1418bb6
--- /dev/null
+++ b/app-editors/texworks/texworks-0.6.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-single-r1 cmake-utils virtualx xdg-utils
+
+DESCRIPTION="A simple interface for working with TeX documents"
+HOMEPAGE="http://tug.org/texworks/"
+SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5[scripttools]
+	lua? ( dev-lang/lua:0 )
+	python? ( ${PYTHON_DEPS} ) "
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-release-${PV}
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+		-DPREFER_BUNDLED_SYNCTEX=ON
+		-DWITH_LUA=$(usex lua ON OFF)
+		-DWITH_PYTHON=$(usex python ON OFF)
+		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
+		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
+		-DQTPDF_VIEWER=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_SHARED_PLUGINS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx default_src_test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/texworks/texworks-0.6.5.ebuild b/app-editors/texworks/texworks-0.6.5.ebuild
new file mode 100644
index 000000000000..5a37d1418bb6
--- /dev/null
+++ b/app-editors/texworks/texworks-0.6.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-single-r1 cmake-utils virtualx xdg-utils
+
+DESCRIPTION="A simple interface for working with TeX documents"
+HOMEPAGE="http://tug.org/texworks/"
+SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5[scripttools]
+	lua? ( dev-lang/lua:0 )
+	python? ( ${PYTHON_DEPS} ) "
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-release-${PV}
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+		-DPREFER_BUNDLED_SYNCTEX=ON
+		-DWITH_LUA=$(usex lua ON OFF)
+		-DWITH_PYTHON=$(usex python ON OFF)
+		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
+		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
+		-DQTPDF_VIEWER=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_SHARED_PLUGINS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx default_src_test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index a8c815fff37c..d4fd8d0adc02 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,3 +1,3 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD vile-9.8t.ebuild 931 BLAKE2B f5e4fd330d90d5c1946baca2606b95a8e137b8d315535e644ea2958e8f2abcf6f0e406a0f42f03aacccf4e833ad6b00b6d1957868c0bbd94a7a0f659d164feeb SHA512 f46dad12fe9e7271663a47bec0340eb34652cf4f207164998ca9ac6f2c9e429bb15b9bbfce54569d398d5044ae2e6f51343b6575e7b2d5cdafb643c46e2b58ad
+EBUILD vile-9.8t.ebuild 932 BLAKE2B eb6eef7f01ebfafcc26f7fd205a2c2ca0e06024d0c8124de4d7e18fe4237924ce50b05b5882b314894d65e02e64dd33fc3289e920e2df2e16f86b37d5f7bc74a SHA512 de079dad8358ea93fc03dd21658a3855c54d2ddded1e616b31d33ed8d216ef6f862a266053bcd9cd772e89e5e3b20a5e5c5f3303c58a441ba22bb9f36b34380e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-editors/vile/vile-9.8t.ebuild b/app-editors/vile/vile-9.8t.ebuild
index 106eb815b23c..36834959d075 100644
--- a/app-editors/vile/vile-9.8t.ebuild
+++ b/app-editors/vile/vile-9.8t.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 3f89490f9dcb..3e42e5e25d44 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,17 +1,11 @@
 AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a
 AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
-DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
-DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
-DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
 DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
-DIST vim-8.2.0210.tar.gz 14757725 BLAKE2B b78ed42b42d40911efb76d4317c116b1c207909ed47241f9dbe6cf6385a4a25ee8cceb2d883171dd922027fb91e9f25e4741fdcd6ebc69217e7d26eae2f88efe SHA512 118131c7c186bac36b3e4928a0021e03b4bf197e1d5651019f4fcf8d4fee89fb7e0123adaf18bebc932c5e06217904526d0625513646e34aebf6cfdee8885260
-EBUILD vim-core-8.1.1486.ebuild 6916 BLAKE2B ee71050b4941f1e33a7dba5da705c89e11c2a304b92868e937620c618f9346035a532e6f4cec0962fc2235cecb65402995dff5f9e4b2ef3f56c8f14afa3be009 SHA512 153fa2dd18094c4305c6ba6ba880b6a88cd30e0e4aca7b119f05ab1bf7441c48e7fda0fdc0f1fea0426ab2f75b06277b8f09478af2e621c9ab6bcad17000a4b3
-EBUILD vim-core-8.1.1846.ebuild 6926 BLAKE2B 466e6b784517dcd1d71a23bb1daba145e01ec8fb09d1560984c5a4641bf03177d36dd43be67402f7b87fecca7bfad264d54d404d4355c9a4f141f8bb1821fd62 SHA512 a660417f9e9d5493d49c9c118e38de7373ef1429093bf68577a535083725dca32a8415d44d50165ca29d369cb1b2211ee8fb3fe0c415709b35247ddad7efec50
-EBUILD vim-core-8.2.0055.ebuild 6926 BLAKE2B 5c50fb2c6a266ab19f8b8aa9bab7c099a1d52d3735de9404a74920de926ffc9994b66c526d777f918d64c2f97cfe0d44bc7d17757dd226f0758346a1a7f01e37 SHA512 a0f833d10f85ce8695b205be4b026e6aeeb189fa7817f02b4f5b657e7d95a88267d51dead4240ee1bfc10dc79157885278f62a12f3b89e906d39f681e985f49a
-EBUILD vim-core-8.2.0114.ebuild 6917 BLAKE2B 63b8d9cc79678377f3b8b2c1a3ca59061080dced4eb2a3c38259265f7d08573fb7f0cd3a0e7d0bfd9e748198bdb5d84065955e12013e3f68ffa0c989de8e825a SHA512 7d70d62bd36e97a1c021f81098bc3adc614518045401f77ad092b891bfda8f0d2e1792e994fd79159db88ef09fb164218918738ef652576ce4b59d4c6cabe9d9
-EBUILD vim-core-8.2.0210.ebuild 6917 BLAKE2B 3b181fc11ac2a77537eb81a72c700c70b0117780f17577013b04db7f3d7d027d60078d7fb51fb41affe4696205871e0eead822f22384f02c1748c654e69e694e SHA512 b9041c1a25395beb192379347cb3fc2b35c517588e2f5b051c4d8d48d70441a3c755fe1ccc6289eed6ea15a22c899f8547c1ebfe7ca6ab9d616a9d7eac12c9d2
-EBUILD vim-core-9999.ebuild 6917 BLAKE2B 3b181fc11ac2a77537eb81a72c700c70b0117780f17577013b04db7f3d7d027d60078d7fb51fb41affe4696205871e0eead822f22384f02c1748c654e69e694e SHA512 b9041c1a25395beb192379347cb3fc2b35c517588e2f5b051c4d8d48d70441a3c755fe1ccc6289eed6ea15a22c899f8547c1ebfe7ca6ab9d616a9d7eac12c9d2
+DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
+DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
+DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
+EBUILD vim-core-8.2.0360.ebuild 6906 BLAKE2B 1ecc1f692f3ff39c6b118dcd1e164075ad1bf333c44201fb28a24b15d97219eccaa1a3eafa9f31c7964d666f0bfbef0f7c15f449f47c1035b12e03ec8493d54d SHA512 07aa53185a7e8be5f04f69184d70d95bac4e3860da4fa302819e6f4ea0fc12de9549cc6c15c028a2a3911d1188e5ec1f0e76ee217c26b02b339b9453a1a9394c
+EBUILD vim-core-8.2.0508.ebuild 6932 BLAKE2B d48bf47e940afaf07e5bc895f8ebcca502743c7a7645769c1e6b03880b17dd7264bb0223f4303c26a1b0f91151e5fadc8b72787ab2b729efd04a216224463589 SHA512 e4c10050a8306994218defb29eabad1f0fddaf611636488894badd41c18788ff747bbd477626532fb8755f5a9ef663f2d1717c8f15ec2c0d5a88cf01f8ada153
+EBUILD vim-core-9999.ebuild 6913 BLAKE2B 042200cf91aa6df1f07f39b105ccffac69241d046ad850f51a839ada0274e3b394834df838e906ff1f177e5cc388ddba5882a52ea3de21cecab0235a6dc44c6b SHA512 64523a67f38cd56d2641b51483d70baa3d71cfe7aed1e284916d63d2305a2fe6ecfd399f5c55f8f3892fa73ed0f5e026286a5f58d4c70d62c2b6b92fbff3d7a8
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.1.1486.ebuild b/app-editors/vim-core/vim-core-8.1.1486.ebuild
deleted file mode 100644
index 8011fa67275e..000000000000
--- a/app-editors/vim-core/vim-core-8.1.1486.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-# avoid icon file collision bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/vim-core/vim-core-8.1.1846.ebuild b/app-editors/vim-core/vim-core-8.1.1846.ebuild
deleted file mode 100644
index b12aef7dde9c..000000000000
--- a/app-editors/vim-core/vim-core-8.1.1846.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-# avoid icon file collision bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/vim-core/vim-core-8.2.0055.ebuild b/app-editors/vim-core/vim-core-8.2.0055.ebuild
deleted file mode 100644
index 45e3680e2efd..000000000000
--- a/app-editors/vim-core/vim-core-8.2.0055.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.2"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-# avoid icon file collision bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/vim-core/vim-core-8.2.0210.ebuild b/app-editors/vim-core/vim-core-8.2.0360.ebuild
index e8ecb7550a62..21ea460ef5bd 100644
--- a/app-editors/vim-core/vim-core-8.2.0210.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0360.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.2.0114.ebuild b/app-editors/vim-core/vim-core-8.2.0508.ebuild
index b5cbae1c222a..28ba2d3038ab 100644
--- a/app-editors/vim-core/vim-core-8.2.0114.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0508.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index e8ecb7550a62..d1dbef9e8f10 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e70e8d8c07db..a3c33ecc4daf 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,15 +1,9 @@
 AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
-DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
-DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
-DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
 DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
-DIST vim-8.2.0210.tar.gz 14757725 BLAKE2B b78ed42b42d40911efb76d4317c116b1c207909ed47241f9dbe6cf6385a4a25ee8cceb2d883171dd922027fb91e9f25e4741fdcd6ebc69217e7d26eae2f88efe SHA512 118131c7c186bac36b3e4928a0021e03b4bf197e1d5651019f4fcf8d4fee89fb7e0123adaf18bebc932c5e06217904526d0625513646e34aebf6cfdee8885260
-EBUILD vim-8.1.1486.ebuild 9068 BLAKE2B 2c49c2980f6e45c9b210bf9d1ca0edeb6f308f4aa8d7990066e4a4c6c34491f8bebee29e7f918282969ec45073f2f547a30e29b4027832261fff0d43ef6495b1 SHA512 4263af06b7ea6320ba654d8ef8c40f1735186c282279c63e0905bc89755b76edb11629cb53bdd597fc5e46d5551753d8e4ced3d025c1da04a4713144886d1d4e
-EBUILD vim-8.1.1846.ebuild 9154 BLAKE2B 9963fe3bffcf4ecc6ccb82751152e6f4428865c00bae9c8f7e86ce9038b2f791679c74d4b14bcb1cb0eeec97998745263851ce58ca26c9cb3f9392b007ca578e SHA512 3ed6f3180065ce544e3f48cdb8cad923188511ca2170d5145bcd0ae4e78a22a964db491e4eafb56f2ec791c81369dd0f09ca6ad438347c232751763a3852a1fc
-EBUILD vim-8.2.0055.ebuild 9154 BLAKE2B 2d3d69e1fe5e8b777dfe7c2e6a34d0f00e739cd162e6306a2fead62c795b799fe92f03a48e8c9d150a5d609d9aa11190afdb6e229d2ae2ca6a4e8faa0aade033 SHA512 d8f6c1c253d01df537e2c6edcbc964c8c1ce7035967eebe5c0c9511acb1bc4411c999bf6dd3acc4d95edf7afb9382214beb3dd7a73e023cd8a7b706a3a86c1af
-EBUILD vim-8.2.0114.ebuild 9043 BLAKE2B 3dea56da891356560d81f8aad7ff902bcc6e7aa30478051b0ca1704483b8758919547de3461f874fe09c637298ba8703eba4cbc98642d69545e103c2ea2e665e SHA512 2e4fd2908d6e5bda8aeee29b37dfcb6ffda2c5aaccfac820dbfff58663ab6ca498c26d0c5cc32e7809ba70e655aeedaa5962bef3fe2aa0d2f1b2f728fc9ba000
-EBUILD vim-8.2.0210.ebuild 9058 BLAKE2B 474d6d874b1866c295f9cd41519ce6517fbdd11608bca8f8f85251f5c2986b4e83a740c4cae6c35b6c4e6a23cf7ee98ac673f826a16c9791358fb8faef1a1818 SHA512 7f585586e1af37ef716f111411a0bbc75b2fde3141be76cbe4b8948a20f6ed6c3020f409572418ee44047d51a4327b3548dcf4eba59b85f94c27e1e432ec29bb
-EBUILD vim-9999.ebuild 9058 BLAKE2B 474d6d874b1866c295f9cd41519ce6517fbdd11608bca8f8f85251f5c2986b4e83a740c4cae6c35b6c4e6a23cf7ee98ac673f826a16c9791358fb8faef1a1818 SHA512 7f585586e1af37ef716f111411a0bbc75b2fde3141be76cbe4b8948a20f6ed6c3020f409572418ee44047d51a4327b3548dcf4eba59b85f94c27e1e432ec29bb
+DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
+DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
+DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
+EBUILD vim-8.2.0360.ebuild 9047 BLAKE2B 61761262f606478b9bf0d3ed8a1e33d88675409b559b821285ac819222f8fb20cf4d1a473310b22a0f066e34d2794fb747f9abd66b83457e0ebe050e9ca0bfd4 SHA512 4de6099691f5bb9cb991b794bcfb257b835cf20d3dcb79e3715b9ffc92696a74094cddbd143734854420218e96bf9c482625c4c8d1cf0a55aafc07e128ce6fd0
+EBUILD vim-8.2.0508.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
+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.1.1486.ebuild b/app-editors/vim/vim-8.1.1486.ebuild
deleted file mode 100644
index 7030a92b7e63..000000000000
--- a/app-editors/vim/vim-8.1.1486.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? ( ~app-editors/vim-core-${PV} )
-	vim-pager? ( app-editors/vim-core[-minimal] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_with python python-command $(type -P $(eselect python show --python2)))
-			$(use_with python python3-command $(type -P $(eselect python show --python3)))
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	domenu runtime/vim.desktop
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
diff --git a/app-editors/vim/vim-8.1.1846.ebuild b/app-editors/vim/vim-8.1.1846.ebuild
deleted file mode 100644
index dda7aa265740..000000000000
--- a/app-editors/vim/vim-8.1.1846.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? ( ~app-editors/vim-core-${PV} )
-	vim-pager? ( app-editors/vim-core[-minimal] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-canberra
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			$(use_enable sound canberra)
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_with python python-command $(type -P $(eselect python show --python2)))
-			$(use_with python python3-command $(type -P $(eselect python show --python3)))
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	domenu runtime/vim.desktop
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
diff --git a/app-editors/vim/vim-8.2.0055.ebuild b/app-editors/vim/vim-8.2.0055.ebuild
deleted file mode 100644
index f397bd99178b..000000000000
--- a/app-editors/vim/vim-8.2.0055.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.2"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? ( ~app-editors/vim-core-${PV} )
-	vim-pager? ( app-editors/vim-core[-minimal] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-canberra
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			$(use_enable sound canberra)
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_with python python-command $(type -P $(eselect python show --python2)))
-			$(use_with python python3-command $(type -P $(eselect python show --python3)))
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	domenu runtime/vim.desktop
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
diff --git a/app-editors/vim/vim-8.2.0210.ebuild b/app-editors/vim/vim-8.2.0360.ebuild
index ac2920a55c28..d80d7777de3f 100644
--- a/app-editors/vim/vim-8.2.0210.ebuild
+++ b/app-editors/vim/vim-8.2.0360.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.0114.ebuild b/app-editors/vim/vim-8.2.0508.ebuild
index 617022926398..5bc04c0d2b05 100644
--- a/app-editors/vim/vim-8.2.0114.ebuild
+++ b/app-editors/vim/vim-8.2.0508.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIM_VERSION="8.2"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index ac2920a55c28..5bc04c0d2b05 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 43ca02dd3ebb..f5330f9275e7 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -4,6 +4,7 @@ AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb
 AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b
 AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3
 AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285
+AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f
 AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
 AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
@@ -11,8 +12,9 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 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 6738 BLAKE2B 7a0572e2798dfd14f6a4757883ea1716337df515898f068ae1f99703eaf7b8f48199e0f30ea39e0e4e4f5454f521a89c56cb1e02bd2a5b383bf2066f4ed12ab9 SHA512 c1291830b06b3cc1ac43409a714ed5d67d6d310d7b1f95e7a92bdb729aaa18b253f76d3383852913e5f91fa90b62412f15b973a6f34ff51f2f5f247ce7f8067e
+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.ebuild 6780 BLAKE2B 0470e598a7049669904cb8bcc4a0d3809b6dd83e4bbc2518ebda38ae5aff12d822be22a5b5252bb17b6d8b26110647ce1f6f07535a0f3d61f6dcd66fd84d3092 SHA512 871ce7f54315a72ace4c9c4f0e9118a702f1097995b3f739f43fdcca4ebd703d1fce040a84722745899cb1330fecda0c8a5a50d6669b7caf4f050df0e0a37927
+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 7311 BLAKE2B 67810b578f75a440df11a75ad20660b928db6d1c6535c2677af9175d4eb9caa1dd1ecbf71465e0a6fb4d7a8a471c27ae5b4cfb21924734f51afe9fc72cf24f29 SHA512 32a2dc82de8d93d9edd950548946549a4cf0fcafb7902e8d84e0dc75fd2643718c8bec10566fcfbdca380dc5466ff4c3e8c95dc65477fe47275c7afba0252b98
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch
new file mode 100644
index 000000000000..fdea052fba19
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch
@@ -0,0 +1,24 @@
+diff -r 3ca291c0f7e3 configure
+--- a/configure	Sun Jul 28 10:17:08 2019 +0100
++++ b/configure	Fri Mar 06 21:27:48 2020 +0100
+@@ -9987,7 +9987,7 @@
+ 	    libc_version="GNU libc $libc_version (Debian)"
+ 	  	  fi
+ 	            if test -z "$libc_version"; then
+-	    libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'`
++	    libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'`
+           fi
+ 	;;
+ 
+diff -r 3ca291c0f7e3 configure.ac
+--- a/configure.ac	Sun Jul 28 10:17:08 2019 +0100
++++ b/configure.ac	Fri Mar 06 21:27:48 2020 +0100
+@@ -2347,7 +2347,7 @@
+ 	  fi
+ 	  dnl #### Tested on Debian, does this actually work elsewhere?  ;-)
+           if test -z "$libc_version"; then
+-	    libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'`
++	    libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'`
+           fi
+ 	;;
+ 
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index a9aedfa1795f..032b668af1e9 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 89902016197a..7b39f0f4f265 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.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 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
new file mode 100644
index 000000000000..de468834210d
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	>=sys-libs/zlib-1.1.4
+	!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0[xft=] )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	canna? ( app-i18n/canna )
+	freewnn? ( app-i18n/freewnn )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	default_src_unpack
+
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	eapply "${FILESDIR}/${P}-gcc5.patch"
+	eapply "${FILESDIR}/${P}-glibc-macro.patch"
+	eapply "${FILESDIR}/${P}-as-needed.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+
+	eapply_user
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# bug #639642
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena or use Xaw3d ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff )"
+		myconf="${myconf} $(use_with png )"
+		myconf="${myconf} $(use_with jpeg )"
+		myconf="${myconf} $(use_with xface )"
+
+		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with canna )"
+		myconf="${myconf} $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+	use alsa && soundconf="${soundconf},alsa"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm   && mydb="gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	use debug && myconf="${myconf} --with-debug" ||
+		myconf="${myconf} --with-optimization"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-newgc \
+		--with-system-malloc \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+		mandir="${ED}"/usr/share/man/man1 \
+		infodir="${ED}"/usr/share/info \
+		libdir="${ED}"/usr/$(get_libdir) \
+		datadir="${ED}"/usr/share \
+		install
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${ED}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+
+	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+	einfo "incompatibilities:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index 98ac3c7815f6..6d978b306c95 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -1,3 +1,3 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD xvile-9.8t.ebuild 861 BLAKE2B 125c2198713c34fba6701360793946ccc8f63c265cbdd8f43a6c6ed2bc5bc24d072135e184317a5226af4b239eaf7eaccba8752c1848c3e1b3ecefc618d9d01c SHA512 a918ce12a0f0f5641c4979df33e2791ffed0ef5a0dc1a8fc2bc359a1f3ed352905390d1dbf98c046479eb98a315f184cbe4c1c35b219f080b29de260107f5411
+EBUILD xvile-9.8t.ebuild 862 BLAKE2B a4e91bf79dac14018df1d79004375a608eb98afb407acacea681ae9887af065688aabb82cb6b4a7bcae3d2d3bfa59a70a5a707504be8a4e5f5a0acf7b783baf5 SHA512 7bd7b12aba51c326a76155d411d652b2f397c11032cdf1f45365516b41e260f7997f1a7e3fd7574181f54fd57770ba2381277f3732e821136551294c1b5af666
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/xvile/xvile-9.8t.ebuild b/app-editors/xvile/xvile-9.8t.ebuild
index 5f9413cdc977..a18545b97b79 100644
--- a/app-editors/xvile/xvile-9.8t.ebuild
+++ b/app-editors/xvile/xvile-9.8t.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )