gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-editors
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
62 files changed, 1681 insertions, 1432 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 96decf418a6a..d47fac5686ce 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
index 4e159b21105e..eefbd974f521 100644
--- a/app-editors/aee/Manifest
+++ b/app-editors/aee/Manifest
@@ -1,8 +1,6 @@
-AUX aee-2.2.15b-ae-location.patch 2656 BLAKE2B 249d858c5ca410b422d73f5932b13cc9a9ea007e1099e6a8e9f81e7f8a0ef6cb835ada70f14b1ae6178e761a661d783f42d77b2168be328635b51bfe61a9dc32 SHA512 1de3fa054e64f24cf45bf89dba133c60f24a79b8ce6abce7ad4ede595110cfda22121fa636f8d2c48866e68175008505299fc5e020d834e413eb34859711b313
 AUX aee-Wformat-security.patch 225 BLAKE2B 0e3846a9e616ed9cef7a9f2b01bf6f71f080d8817010e6befb89cbbda28fa3f8c85f47f9f6f3c06236da64d0110dd8d3426ee7c6fb646398467b493564d50fae SHA512 bc2647b6e29ed039dd683c15001f7ee992091221ee9851bd302c066ce7c49ca6bcf01ef5eb111b6d998804074855eea497284a579835e3d335d7bfe422dad190
 AUX aee-ae-location.patch 2755 BLAKE2B 8b75ee712b5f717c82a073c0e35ceccdc0ed27d6b9c8f64841d6c246cd6761b5d42d121e78374029b0c0252c479ca56ab072c7612d0ef758641cefb1d32459f9 SHA512 48ded083b407d1fb94764967358dc6c858421a3586e56fca1803980912b90404dcbfcadfc5a041b0959e2e10b3a5224751671ec067687b2e361eb2e27eb86cfa
-DIST aee-2.2.15b.tar.gz 184218 BLAKE2B f249c0974a971aa6a1bb38afb8675a3ace671d244c717add4ea2f724ac1d07bf1c57c5d27fb6f9f40f27b3055ba94cf959dd4b855181a83f4522c44124c0b994 SHA512 2810cd8f5148edb352fdaefbc823d417b9a83c8083644c8729be8595013ca8ba660bd72120db1e15915e454f5185d2d030c2f0c853b37eb83c213c1d581a640f
+AUX aee-gcc-10.patch 706 BLAKE2B e969db928f0327a070ceaa9808cdae3cdafb3588e94fd8414fbca7b27e0c17bb12e542531f162c2de135a88bc09168bd77c9a2ee2368499a39ce7760f99aa0f8 SHA512 bd560e541af9323feeda9f9138bf28c21af6d0099fda7f014ae82dd988f3fd6f9d2abf1c4883610a20b3708d48d8392bc3e60a01c3798604e6c6dd60f8f838f9
 DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a
-EBUILD aee-2.2.15b.ebuild 1224 BLAKE2B 245976628269fd328d3923a0e302d42a2fc93168efc4c308749d4b95b6005dceec491d587aea9ab182b95cfd096470a8d1852f8096165e6da7526ac9b1742b1a SHA512 0a8047efc8c58561e49c186b96035c9c8b340194c7332efdc52fe6ba578f9960161d2500abb0a898176ad685b4267f0f8d287374307e5505794edfb13fc32247
-EBUILD aee-2.2.21.ebuild 1227 BLAKE2B 097ed3e56e30e7b73782dad3c195ce182c13acd3a4e765f6816d31b9dd4f0d47984edcb0c6c55f229e15d2ad4a036ff0bd41a4dd9cfbadd61633b60c582f394f SHA512 8d7f1abfaa36cc1cbd4e7bb170e1fd9e938956e050fb03b0452dc04e9aded3052c5db92b674f5f78ac990756ceda6ef42c9a675414543ffecff74a52b3f3d9fb
+EBUILD aee-2.2.21.ebuild 1256 BLAKE2B fb4407c3e59663529373561ff7cba079cce97c347203d2c876db6511d18bc08181b8c3008edb163153f7d2d8092c57204bffb12eee196368c3cc5679c102476a SHA512 d73bfe90989391372e3a5b968110feb2a8a9ccd9405d814a681c432965606169ec15a257137ff9fb47db3b906c720d1f3fc18b65dc95dad0f2f265dcf979417b
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild
deleted file mode 100644
index bbd9266d8086..000000000000
--- a/app-editors/aee/aee-2.2.15b.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor"
-#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ae-location.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
-
-src_prepare() {
-	sed -i \
-		-e "s/make -/\$(MAKE) -/g" \
-		-e "/^buildaee/s/$/ localaee/" \
-		-e "/^buildxae/s/$/ localxae/" \
-		Makefile
-
-	sed -i \
-		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
-		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
-		-e "/other_cflag/s/ \${strip_option}//" \
-		create.mk.{aee,xae}
-
-	default
-}
-
-src_compile() {
-	local target="aee"
-	use X && target="both"
-
-	emake CC="$(tc-getCC)" ${target}
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/rae
-	doman ${PN}.1
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins help.ae
-
-	if use X; then
-		dobin xae
-		dosym xae /usr/bin/rxae
-	fi
-}
diff --git a/app-editors/aee/aee-2.2.21.ebuild b/app-editors/aee/aee-2.2.21.ebuild
index 763b9cf91901..69453af195f6 100644
--- a/app-editors/aee/aee-2.2.21.ebuild
+++ b/app-editors/aee/aee-2.2.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 )"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-ae-location.patch
 	"${FILESDIR}"/${PN}-Wformat-security.patch
+	"${FILESDIR}"/${PN}-gcc-10.patch
 )
 DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
 
diff --git a/app-editors/aee/files/aee-2.2.15b-ae-location.patch b/app-editors/aee/files/aee-2.2.15b-ae-location.patch
deleted file mode 100644
index 4a17642b915d..000000000000
--- a/app-editors/aee/files/aee-2.2.15b-ae-location.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/aee.1
-+++ b/aee.1
-@@ -678,7 +678,7 @@
- .\"
- .SS Initializing aee From A File
- .PP 
--\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR, 
-+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR, 
- .I .init.ae 
- in the user's home directory, then for \fI.init.ae\fR in the 
- current directory.  (This file may be created manually or by using the 
-@@ -960,7 +960,7 @@
- .PP
- On-line help is provided through the 'help' command or menu item.  This 
- command uses a file with help information.  By default the help file is 
--located in \fB/usr/local/lib/help.ae\fR, but this file may be located 
-+located in \fB/usr/share/aee/help.ae\fR, but this file may be located 
- in the user's home directory with the name \fB.help.ae\fR, or in the 
- current directory with the name \fBhelp.ae\fR.
- .\"
-@@ -1017,7 +1017,7 @@
- .\"
- .SH FILES
- .PP
--.I /usr/local/lib/init.ae
-+.I /usr/share/aee/init.ae
- .br
- .I $HOME/.aeeinfo
- .br
---- a/aee.c
-+++ b/aee.c
-@@ -2612,7 +2612,7 @@
- 
- char *init_name[4] = {
- 	"/usr/local/aee/init.ae", 
--	"/usr/local/lib/init.ae", 
-+	"/usr/share/aee/init.ae", 
- 	NULL, 
- 	".init.ae"
- 	};
---- a/aee.msg
-+++ b/aee.msg
-@@ -2,7 +2,7 @@
- $ 
- $set 1
- $quote "
--1 "/usr/local/lib/help.ae"
-+1 "/usr/share/aee/help.ae"
- 2 "main"
- 3 "modes menu"
- 4 "tabs to spaces        " 
---- a/help.ae
-+++ b/help.ae
-@@ -1058,11 +1058,11 @@
- 
- 	The file 'init.ae' may be used to set parameters and define keys to 
- perform certain functions within ae.  This file may reside in three 
--locations: /usr/local/lib/init.ae, .init.ae in your home directory, and 
-+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and 
- .init.ae in the current working directory.
- 
-         First, aee checks for a system level initialization file, located in 
--/usr/local/lib.  Next the user's home directory is checked for a file named 
-+/usr/share/aee.  Next the user's home directory is checked for a file named 
- .init.ae, then the current directory.  The settings from each file are read, 
- so that the directives from the most recently read file will take precedence 
- over previously read files.  This allows, for example, the .init.ae file in 
---- a/help.c
-+++ b/help.c
-@@ -12,7 +12,7 @@
- 
- char *help_file_list[4] = {
- 	"/usr/local/aee/help.ae", 
--	"/usr/local/lib/help.ae", 
-+	"/usr/share/aee/help.ae", 
- 	"~/.help.ae", 
- 	"help.ae" 
- 	};
---- a/localize.c
-+++ b/localize.c
-@@ -64,7 +64,7 @@
- 	catalog = catopen("aee", 0);
- #endif /* NO_CATGETS */
- 
--	ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae");
-+	ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae");
- 	main_buffer_name = catgetlocal( 2, "main");
- 
- 
diff --git a/app-editors/aee/files/aee-gcc-10.patch b/app-editors/aee/files/aee-gcc-10.patch
new file mode 100644
index 000000000000..c8747099e588
--- /dev/null
+++ b/app-editors/aee/files/aee-gcc-10.patch
@@ -0,0 +1,44 @@
+--- a/Xcurse.c
++++ b/Xcurse.c
+@@ -37,6 +37,8 @@
+ 
+ extern int eightbit;
+ 
++struct _line *top_of_win;
++
+ static WINDOW *virtual_scr;
+ WINDOW *curscr;
+ WINDOW *stdscr;
+--- a/Xcurse.h
++++ b/Xcurse.h
+@@ -132,7 +132,7 @@
+ 	int number;
+ 	};
+ 
+-struct _line *top_of_win;
++extern struct _line *top_of_win;
+ 
+ typedef struct WIND {
+ 	int SR;		/* starting row		*/
+--- a/new_curse.c
++++ b/new_curse.c
+@@ -85,6 +85,8 @@
+ #endif
+ 
+ 
++struct _line *top_of_win;
++
+ WINDOW *curscr;
+ static WINDOW *virtual_scr;
+ WINDOW *stdscr;
+--- a/new_curse.h
++++ b/new_curse.h
+@@ -161,7 +161,7 @@
+ 	int number;
+ 	};
+ 
+-struct _line *top_of_win;
++extern struct _line *top_of_win;
+ 
+ typedef struct WIND {
+ 	int SR;		/* starting row		*/
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
deleted file mode 100644
index 18d9ae27ea14..000000000000
--- a/app-editors/atom/Manifest
+++ /dev/null
@@ -1,42 +0,0 @@
-AUX apm-python.patch 388 BLAKE2B 1f3187b4219bb849ce87fd83dd19c335f9c163c63a8660b552235dda2a16b3247c56cc82c17eae7bd7b45516a8dbf345332fb0d22d57589cf7edcd4c448da27c SHA512 5d280b2a37c8f1b03156627c1622d0a5c76edda7523353b7b60e6ba563f090e6472eae318689bd964cc98503a963aa591d3ed37929f1df36f81ab893ad437f21
-AUX atom-apm-path-r2.patch 537 BLAKE2B 68f5a53be36f34a4953450f6ff466bb00256c028adf290b3bd8c63b966c06dbdc9fcb6a12c95172aabc9010f0b1a4c6522390a4ad6012a0f60e11a38a61373cd SHA512 1172c72c94d25538d63e04202f273b87f794431847d9b1138d4eb43d4578d47ca1ecf2636170a8648eef2afaf01a35114752ebecad2b9cd8c7d4ae04dcbc741d
-AUX atom-fix-app-restart-r2.patch 835 BLAKE2B fba9d512852126cdc2e06564642e1c2b70d83b60eb39921d43f6d00c8808e8ad6ddcbfbd90e2bee5a09df4bd2c6348b17abdff100b212fbf3aa0c6e251ce068b SHA512 abd16c7474b9aa190907a9f8052ac87f35b7747c2495c2a2ab8821054c36b7bdedc976ed9f4fc7f790ae340cb8d5b201f9f865a546ab398c6e61afe1bcfd5b5f
-AUX atom-fix-config-watcher-r1.patch 1581 BLAKE2B 668fcc63dab8ee2aa0ecd118ff28c42139b69effb8a11a2129e9fe5f3cd8a058c3f8e5a84bd677207013a9e3788d803de673ad01008a8504912e9ed5722242ba SHA512 c6d5729d12cd66ffdc60f7a21387d228207acc30c987ae66f3df9d0aaacd41f64e83047f3afbd952cfebacee60fe77a808e8e34b73c08b5dac86470c8d3c5ee1
-AUX atom-marker-layer-r1.patch 418 BLAKE2B 4001c4e8bd64cf6389bb2f5550e5b243fb0fabb0627e76e70ba8c863a3d9be6b2412cfc6dffbb3911e450484d636dfc705f721ef16654aa7c435d5cb2ad0fc1e SHA512 c8bd34e4747626642a57596ef36c4ddbaee36273a213aa4439d0c64557084c7c5bdb25735ffc3c118533ce43dbf2ad638258c29b52a58a28e417163279ada925
-AUX atom-python-r1.patch 506 BLAKE2B 8df707aa71b1db54bdcd5934cc88f66cd75564669365e93a3cb1e5d628257a2a160d339bf31402e88b44fadcff59870cd9e4704ecb7b3d65c631f2ce08143c70 SHA512 a7c1db374705ec5c215440d2c4c1e5a13333ed65c2c43ac4e05fd9d8bde58c2c2966e2f695129f40cb4e6a29e9da0e5123042ddc85001913e7489809764bddc9
-AUX atom-unbundle-electron-r3.patch 1214 BLAKE2B dbc0891872074f6de0067ed14b947b292665686686498ecf7d10fced4025c07b851bd12a4c78ef3a413c908602e252a1ecbef00cb98d47728e123ac885c1d82a SHA512 d9df0a496f6ef1cfa0462397e3da0d887fa681c575edc4a9958e1b187833b90733df8f0eebafc84ba70877c4a264443994afa86c09dbdd3e5dc15ae3ed26753d
-AUX gyp-unbundle.py 3933 BLAKE2B 638bf2ad17c5e052c4b1972ac91a1d0d6b0d9d361cb0d04c3e732c892af54a30b099069ac4bfb0f8882ac3d049c25a53d698cc95aeb23a486d92284a1ac21376 SHA512 5de7aab9b2fcf135fac5429a2655acfb53ed40871ca51281be237393b0318b06339d20af196275bc48acac456eac61e884821da7abeefb9991bf2502d2835cfe
-AUX transpile-coffee-script.js 602 BLAKE2B 42dd30146f463b598d3d8681229eb479554df3486a9e7bab6950999961c5adbe3c9eb42b2dba733ea96388766616de4ffab898feb1cbe076b6fb2af4d2b40d98 SHA512 f82cb3108cc6dd806f0931e88f1bb4451f2aa3b7ad38e2e458a6810a78cbfa5e2ca68e3db0c7a2f400097b7b2978ba5f5ba29669e6f1598521f9f9533bdfc1a4
-DIST asar-0.14.3.tar.gz 1516628 BLAKE2B 4f04d08c3084843bc3974e99dea2bd327843afd97575fbedcc0ae224c9511be2b2a178a0ff0e555f1c890218d768cca6616a39a0a4fb2fd119f94b074db73ef7 SHA512 8dc099d038d7c8748d20d64adb037167e43640bb923391d2d94f1e2859d41700b39d6b631ee959505cffc695b8284f7e09d43a914af7effc349a768cfaf1efb4
-DIST atom-1.32.1.tar.gz 11685572 BLAKE2B 4e2463d56d3c4c54e3661e8eeb665a86b165f317dd221d849fd6b447bf6e895ac573b019356695fce0da0c176702356cbd5ff53e0878edbd49aa95e15323cda5 SHA512 8220c7cf1bb602dbcb312e986b4c2ff560baf3e46903e770135da36d92920da4d9f2490e9a5dc6b04821dbbb033415b6008f0f483d88c841996c06a9bf36f7e3
-DIST atom-bin-1.32.1.rpm 281163511 BLAKE2B 4ff4e055d1cad690c37e6264a7e5771bf50047246950fc45a94cb5217e6cfef2abb8c067efa1ca780550db7f046a8fecc623013cab27fe56df3e22af68f018b6 SHA512 9ff621cb8bcfb185c36eb56cac698a9bd0d2a02b5cc9c7982786b0db241a625188fc6ea9079943bb2c83a122f916a387810fa30161ee9531c1c5c3e28f876f52
-DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff
-DIST atomdep-atom--watcher-1.0.8.tar.gz 702118 BLAKE2B 21fdb472bc1cd6cc396f686e45f1048ff5507d2126e71d92e1531601d142339a97f3ab8748b34cf8ff8c935fc4f2fa36e86a379a05f79403c7bc3949f5ae8ebb SHA512 e77ba7faf192698ec5b1bbe683c81ead8380dc84a2a4c591dea89847d8595aa49fbc5b24b1725f1ab985b1f6c18f7baa19143780f4e2eb0a717054968db59515
-DIST atomdep-cached-run-in-this-context-0.5.0.tar.gz 2697 BLAKE2B aada7cb35fa57abc4e97bc76a1a1c77f167441bf82bec4743b4e570721f67edd1c037033dcf058bf72957c7423c957343697e816e85c401e6497c43af41aa3a1 SHA512 15db433f4bbc5a37ad43de672f3f6f234e9e7c94c5ae6b66939653e85102a724ca8bd69a90d2cc1f2307db55916c66325a56e607f42546807f83595c129ca333
-DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc
-DIST atomdep-fs-admin-0.1.7.tar.gz 5465 BLAKE2B 50e2f5a2b013d3ca877ad608f62c0bb5464b32af55167d3d97b5d03530ff53cf7e84360fe8de2a7e3b29a226ee462b4735ffe5a16d9e6a6e51027f5bd34431b6 SHA512 110362a2a50782d9d7f44acc88fbaf1c2031d0cd5549af6ee28c4617e10655804bd79320e41c44cc606b4c06075100c3a1bab0d5873ee98a995b048821ef84c1
-DIST atomdep-git-utils-5.2.1.tar.gz 4142068 BLAKE2B 7a803e0bbfb8c6afc2e7c82f782d3d80482646935b94e6d878d13120dc0294818a60bfb898a82d3fdea02300bbe473640c1c8fdf2ece9a531eb4b0eb564edad5 SHA512 3eb5da5f8a9bead8bdc94e29d794567969251ddc845c210871d8db9b75f998058bd55085a65d613ddc64ed3daa70544d845ed3557ab7822a2d9c95677bed61b4
-DIST atomdep-keyboard-layout-2.0.14.tar.gz 17919 BLAKE2B 9b2a83cf0b4db13e402d6a97fd8729041a25e7296f5e5be23181bad84a314a9012dc69cc387699b3edc5d37a98fcfe8923feb457c3f80e7d0db7b1610542e49b SHA512 42e09fa440bca1a8ba17ca1a3507718b9fb5408a5a42ef4749523dcb3902d876c85de0676a1cc7143455194b70c005a2367ce33418d423f763b2b30651380ad7
-DIST atomdep-keytar-4.3.0.tar.gz 8896 BLAKE2B 56d669320ee7eeb78eb676a76de6efe4417b80b5931507009b73cf4aa70b4125fd96a7b1ec0bf05ada86d3107dbdb82028517eccccabfb1d61b1fecd08261de8 SHA512 a5dfbefeff9f4b42d02a6cd6956e91d65ce24d716a85f19e4bab182dfb9322a132da90f301b8eeb5b496f1ff6d9c974410c9fff578404254f7e1502d97d87831
-DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1
-DIST atomdep-oniguruma-7.0.2.tar.gz 584590 BLAKE2B 2e3e622fdf7c463fa670786f0af8815ffbb1d7a85ff5759b8b13fa2b4ed8cec5959b4186b09521a3060e42abb5d83505f7b925a18f41c99e4d9dab809e39ec01 SHA512 cc2b1d3714ebac1e3254f33185c20e0c6bf5a7835506ef56bec5a720684ca6ee5d8cee0c4165eb0bb60a8edcdaf8eca846aaa0cb6ec2a9859ad61e5ed830db8a
-DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999
-DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18
-DIST atomdep-spellchecker-3.5.0.tar.gz 476758 BLAKE2B 73ca0225bedf7daa0b9f9e3ad5a549cb124443de0887ee77f1a7a7c1e31f1a1c363a5f0118ecb17e70c4ae64338eac83c24dbe4cd13a6ae182d314d22bef3dc4 SHA512 5daed79d1ba562187937f5c435e2f63bcffcef95e12c18e8b3b05e9afd2b7dc815ea88cd60c4ab5ec714654189c27897dadebb798fa535425ea6d0f56cc6ae1d
-DIST atomdep-superstring-2.3.4.tar.gz 822697 BLAKE2B 0e81ab0fe8d429c80298a70034c0645412e16dcd38540f5a87433689581c741b554a82739e6bb6954d316bd9a9a6425b9770b3880fe883e27199ea1aa10bbe81 SHA512 0dc3644c2741f45dc531945d5114802ec1e2fbb0d6a85088d1c1fe120f26c0183e93142ce86781dcbac652f088e5b101e83b65bb6a31f1460dd289cf37825e65
-DIST atomdep-tree-sitter-0.13.15.tar.gz 193608 BLAKE2B adcc1cec97e0675868b4782a4dede09bbad58e3d85fb55eba9ec0867bc4bc91045db8023aff3975471748297563325359cd6a4819c4474e5aedfec3e8d7565c9 SHA512 16ebd4f9cb0eeedfeb42a2dd2f7fb0e0983ee19976d98e2e0a2e0bf57fea246e7b667ef56733f7a07b434918298889acea0dd8edc109bc5ecafeb0b0d75abdd9
-DIST atomdep-tree-sitter-bash-0.13.6.tar.gz 346883 BLAKE2B f1a7bd0391d3d21223d889deb4e38ecf5e323051977cd42095fdb2ac458803968d1c435e6f7c12b0073486eb677ab2f2748fc7dd76e9228e746ac634221ea1c5 SHA512 9761d822c2f5f608950fa4f91b237db136afd4d545b708412b993f89785eb3a931a9a29fc3a652169af20e3c8281ab28ca117bc59bb4b1f2e1dfb6298c843712
-DIST atomdep-tree-sitter-c-0.13.7.tar.gz 192058 BLAKE2B e673311a6903736d204b149a983159f7ca52ffc3e1b44f7e800f6a8fcebb49059d6fd6e341506d50d19d3781b495bf0414f8794af2f9e6a93e341fd55fdfa264 SHA512 af533977d06be796c3c1a98fbc44f60cf46a4fdc0f233edd9766c462cdad5116398231863d9cfbe4ffb49befe9bf97466c6d8b9a1535d0af835aa0242e4f5ed5
-DIST atomdep-tree-sitter-cpp-0.13.8.tar.gz 610448 BLAKE2B df5ac56a6317c39b5ac1a4d248b0c96751ebed08868977417f68daf30a1c04806874128dd75667d7b543b3062d168ba570783df291931c0a3bed990526eea727 SHA512 3d3b488f8b1e277a73c9c961bf48f3207e6720faac5731d1ed9a02bd01fad0bd844180e867f2bc7b3bc278fe5d218d6808e0e191cf20c763d9fa7e326b34de4e
-DIST atomdep-tree-sitter-css-0.13.7.tar.gz 79065 BLAKE2B 5671e6395f41b3dd2f3154d335e9b581507a8a7ad90ed3f4f27bd89055c96bef82d883984055dbf1675c93fe8aa9edce5151902261300d1cedf1dc7d955b9149 SHA512 c4c85564779300081c5f8991eb7ab32eecd5e477eba7c2217430ec2c0b276bba5b4f5107859c412bba68b1531fd5089c6db9491f81aa1409d9e9f3aa5036ca5d
-DIST atomdep-tree-sitter-embedded-template-0.13.0.tar.gz 6153 BLAKE2B 7da15e09def3a4088b16f691273f0e99311aea53a20577a618026fbd3f4bd78d3cb4c5a6aa694ed3122465621128d26dd084c85d492f8a6d62246a1e50f29a2f SHA512 20956331c2f6060faa17e1e26ed1174c5e0213a03aea9a464aa53c13ed9d767da90aa0ed646444848f8a7ea7ab17d369292a353ad6ef8578845cf75740034b1a
-DIST atomdep-tree-sitter-go-0.13.3.tar.gz 162468 BLAKE2B a3530580f1cddd672807d1d4c6652405a0558edf7d362523d507edacb6ba2abefa58fefe50d762e9c611ab51f6a4b6e62000f2e898058ac3f892fe6e6a11940c SHA512 a579e5103330ac276761a3b37c4ce53255aa644283257106e1b3ef73d8f925277b2180d606bc31a3e5d7bab68b4a56e3d6624bda428b2033bc70a0cdc54b1c1f
-DIST atomdep-tree-sitter-html-0.13.5.tar.gz 13738 BLAKE2B c33b69eeb6b1eba0c864988eafe49327eb2f9a770678b03c49548aeb2fff2a1f31a5132565ca4025c008914a410d6cd0a757e9e435efc90cba58443cc2dc88be SHA512 95ac288df0e58fff6e8c462f2e85b8f964d3876a1cad80983f60f0e4b9b0c6ebef136947aff0f845603c5b53788e9479f2d55e7f4492aa79d0c09925d6934878
-DIST atomdep-tree-sitter-javascript-0.13.8.tar.gz 1729028 BLAKE2B ea2c8de9091ae224e595b0f50d4b32797c0b87937698b074e6603cdde0ecbfd57e6da7d9d6540d0de7175c6386130de5fb3db6a537a935c121eee8c5ae46879a SHA512 a7bbba657117d6c2238063408ae48d9cae8f4a5e45894b10cc457640e018547e46375ddc52752ca1afc189a0cc590dee75da0d5f04ddc6107c530340a258b341
-DIST atomdep-tree-sitter-python-0.13.4.tar.gz 204998 BLAKE2B 54d22a4482705cf482cd13bf8786f2d4a26e709b836007a1cd2bf43a537738a2b27474bc050253462f834f7f211b4c6b5b8b82cc3a1de41faa334c93fdc02db3 SHA512 250ef9ffaf15b0f3125ad7a88ad37181d4e5030e6ca5b4c518ad97822478d6d893b6493c70e35db5f07b3dedb25928285c60cdb5cbb4fd392ae07acaad6aca7d
-DIST atomdep-tree-sitter-regex-0.13.1.tar.gz 17153 BLAKE2B 44e137c5464af5e77011a9d8bb9cd6ffa7abf50bbd27a6fc3b8e53739fd6e6c664bce7c1ed348ecbb2a27e8f301caa8a783c5ba756870622fbe1bfe76ee4a8bb SHA512 03e50bb9539cdfb34e8e69a675da97311c14abc839d4509167b612ba92dd15c1e7825d5a748de70513ec902f40f1efbef6317ee5f2f2b700385fab875bfbff9a
-DIST atomdep-tree-sitter-ruby-0.13.11.tar.gz 2020951 BLAKE2B 106eb35468106d971338e3387484470a61c84da8a1a2f9632eecd0e84fe13dc801da527652817633083469668f03cc9ea4241526cfe414a7c0c2c2d96d44f311 SHA512 101981059db4c9aa11a834604287fd622af6f7fde5bf9718ff2f140d40b51b345fe6961de02b185345808c827b77202ffb79fba77cbf2ceb9793224b888375c0
-DIST atomdep-tree-sitter-typescript-0.13.6.tar.gz 662334 BLAKE2B a4e7898fc115fd73c9a86578aa214cfb11ac0b57bcfe3db8226463a7613d78bec11b987311f8ee884a4aa679ff16deaee158eb36ba8a370be65daff98e41cdac SHA512 d5cb2f0ab5b981fe1de03d195c272db150ebd0cf9f3825d87d7fd3bdee8e01e1d4745bb426c23e084b12e97dd51fbba65f9ffad910d87b57306ef3a10ae2225c
-DIST nodejs-nan-2.11.1.tar.gz 170929 BLAKE2B 21287b45865c578257399abddd2fb6a7234891da47bb97073b7595ace6bafc83630f44141d871b061e5d13b6c4b9e02c0d4883ef0a6d6f0d9851ff645a0ab616 SHA512 a80c2857c2f15c085c506cabd081338e25a5de2028327567a039ed9219b912d36ebdfec80f13bebab9872b981d86a2fcc2c8145739b428b8f4148d1a883e408f
-EBUILD atom-1.32.1.ebuild 17709 BLAKE2B b2b8375ce87b90eeb3f7722f935252e8e6016dd73d59fad07d11fa5cb63806081a408934853c503b8392e4afc224eeac1f27d4323c2d1c6f9619af3a69564456 SHA512 4674605bf8658dfdfc9425dedc505d115a40cdd0168fba25c311d18b5c3249cd3a6382f3fa1cf03a1ffa53b992972db67235724edc26c457c86533137d4f6ce2
-MISC metadata.xml 304 BLAKE2B ddc53cfa1f83c730eba12e19372617c9f46a11a55d2d7fe4e6507e527820fd7fcf9d89bd00f1b6f710c57463a0cc905bac8a3ca0a9bec854a307d99287261e24 SHA512 f56270c797dd260fbc71003262cb210279302f82a75504ebe9717ff0fc126ba548e810468d6df268de27c366aad419d25b85ef6377005c95078a2cf1382fd05c
diff --git a/app-editors/atom/atom-1.32.1.ebuild b/app-editors/atom/atom-1.32.1.ebuild
deleted file mode 100644
index cb97004c983d..000000000000
--- a/app-editors/atom/atom-1.32.1.ebuild
+++ /dev/null
@@ -1,562 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-#       atom overlay.  If you would like to make changes, please consider
-#       modifying the ebuild template and submitting a PR to
-#       https://github.com/elprans/atom-overlay.
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing python-single-r1 rpm xdg-utils
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=2.0.9
-ELECTRON_SLOT=2.0
-
-ASAR_V=0.14.3
-# All binary packages depend on this
-NAN_V=2.11.1
-
-ATOM__NSFW_V=1.0.18
-ATOM__WATCHER_V=1.0.8
-CACHED_RUN_IN_THIS_CONTEXT_V=0.5.0
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.7
-GIT_UTILS_V=5.2.1
-KEYBOARD_LAYOUT_V=2.0.14
-KEYTAR_V=4.3.0
-NSLOG_V=3.0.0
-ONIGURUMA_V=7.0.2
-PATHWATCHER_V=8.0.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.5.0
-SUPERSTRING_V=2.3.4
-TREE_SITTER_V=0.13.15
-TREE_SITTER_BASH_V=0.13.6
-TREE_SITTER_C_V=0.13.7
-TREE_SITTER_CPP_V=0.13.8
-TREE_SITTER_CSS_V=0.13.7
-TREE_SITTER_EMBEDDED_TEMPLATE_V=0.13.0
-TREE_SITTER_GO_V=0.13.3
-TREE_SITTER_HTML_V=0.13.5
-TREE_SITTER_JAVASCRIPT_V=0.13.8
-TREE_SITTER_PYTHON_V=0.13.4
-TREE_SITTER_REGEX_V=0.13.1
-TREE_SITTER_RUBY_V=0.13.11
-TREE_SITTER_TYPESCRIPT_V=0.13.6
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
-	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
-	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
-	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-${ATOM__NSFW_V}.tar.gz
-	https://registry.npmjs.org/@atom/watcher/-/watcher-1.0.8.tgz -> atomdep-atom--watcher-${ATOM__WATCHER_V}.tar.gz
-	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.5.0.tgz -> atomdep-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
-	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-${CTAGS_V}.tar.gz
-	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.7.tgz -> atomdep-fs-admin-${FS_ADMIN_V}.tar.gz
-	https://registry.npmjs.org/git-utils/-/git-utils-5.2.1.tgz -> atomdep-git-utils-${GIT_UTILS_V}.tar.gz
-	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.14.tgz -> atomdep-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
-	https://registry.npmjs.org/keytar/-/keytar-4.3.0.tgz -> atomdep-keytar-${KEYTAR_V}.tar.gz
-	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-${NSLOG_V}.tar.gz
-	https://registry.npmjs.org/oniguruma/-/oniguruma-7.0.2.tgz -> atomdep-oniguruma-${ONIGURUMA_V}.tar.gz
-	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-${PATHWATCHER_V}.tar.gz
-	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
-	https://registry.npmjs.org/spellchecker/-/spellchecker-3.5.0.tgz -> atomdep-spellchecker-${SPELLCHECKER_V}.tar.gz
-	https://registry.npmjs.org/superstring/-/superstring-2.3.4.tgz -> atomdep-superstring-${SUPERSTRING_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.15.tgz -> atomdep-tree-sitter-${TREE_SITTER_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.13.6.tgz -> atomdep-tree-sitter-bash-${TREE_SITTER_BASH_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.13.7.tgz -> atomdep-tree-sitter-c-${TREE_SITTER_C_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.13.8.tgz -> atomdep-tree-sitter-cpp-${TREE_SITTER_CPP_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-css/-/tree-sitter-css-0.13.7.tgz -> atomdep-tree-sitter-css-${TREE_SITTER_CSS_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.13.0.tgz -> atomdep-tree-sitter-embedded-template-${TREE_SITTER_EMBEDDED_TEMPLATE_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.13.3.tgz -> atomdep-tree-sitter-go-${TREE_SITTER_GO_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.13.5.tgz -> atomdep-tree-sitter-html-${TREE_SITTER_HTML_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.8.tgz -> atomdep-tree-sitter-javascript-${TREE_SITTER_JAVASCRIPT_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.4.tgz -> atomdep-tree-sitter-python-${TREE_SITTER_PYTHON_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-regex/-/tree-sitter-regex-0.13.1.tgz -> atomdep-tree-sitter-regex-${TREE_SITTER_REGEX_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.11.tgz -> atomdep-tree-sitter-ruby-${TREE_SITTER_RUBY_V}.tar.gz
-	https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.13.6.tgz -> atomdep-tree-sitter-typescript-${TREE_SITTER_TYPESCRIPT_V}.tar.gz
-"
-
-BINMODS=(
-	atom--nsfw
-	atom--watcher
-	cached-run-in-this-context
-	ctags
-	fs-admin
-	git-utils
-	keyboard-layout
-	keytar
-	nslog
-	oniguruma
-	pathwatcher
-	scrollbar-style
-	spellchecker
-	superstring
-	tree-sitter
-	tree-sitter-bash
-	tree-sitter-c
-	tree-sitter-cpp
-	tree-sitter-css
-	tree-sitter-embedded-template
-	tree-sitter-go
-	tree-sitter-html
-	tree-sitter-javascript
-	tree-sitter-python
-	tree-sitter-regex
-	tree-sitter-ruby
-	tree-sitter-typescript
-)
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
-"
-
-DEPEND="
-	>=app-text/hunspell-1.3.3:=
-	>=dev-libs/libgit2-0.23:=[ssh]
-	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
-	>=dev-libs/oniguruma-6.6.0:=
-	>=dev-util/ctags-5.8
-	>=gnome-base/libgnome-keyring-3.12:=
-	x11-libs/libxkbfile
-"
-
-RDEPEND="
-	${DEPEND}
-	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
-	dev-vcs/git
-	!sys-apps/apmd
-	${PYTHON_DEPS}
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local a
-
-	mkdir "${BIN_S}" || die
-
-	for a in ${A} ; do
-		case "${a}" in
-			*.rpm)
-				pushd "${BIN_S}" >/dev/null || die
-				srcrpm_unpack "${a}"
-				popd >/dev/null || die
-				;;
-
-			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
-				# Tarballs on registry.npmjs.org are wildly inconsistent,
-				# and violate the convention of having ${P} as the top
-				# directory name, so we strip the first component and
-				# unpack into a correct directory explicitly.
-				local basename=${a%.tar.*}
-				local destdir=${WORKDIR}/${basename#atomdep-}
-				mkdir "${destdir}" || die
-				tar -C "${destdir}" -x -o --strip-components 1 \
-					-f "${DISTDIR}/${a}" || die
-				;;
-
-			*)
-				# Fallback to the default unpacker.
-				unpack "${a}"
-				;;
-		esac
-	done
-}
-
-src_prepare() {
-	local suffix="$(get_install_suffix)"
-	local atom_rpmdir=$(get_atom_rpmdir)
-	local install_dir="${EPREFIX}$(get_install_dir)"
-	local electron_dir="${EPREFIX}$(get_electron_dir)"
-	local electron_path="${electron_dir}/electron"
-	local node_path="${electron_dir}/node"
-	local node_includes="${EPREFIX}$(get_node_includedir)"
-	local binmod
-	local pkgdir
-
-	mkdir "${BUILD_DIR}" || die
-	cp -a "${BIN_S}/${atom_rpmdir}/resources/app" \
-		"${BUILD_DIR}/app" || die
-
-	# Add source files omitted from the upstream binary distribution,
-	# and which we want to include in ours.
-	cp -a "${S}/spec" "${BUILD_DIR}/app" || die
-
-	# Unpack app.asar
-	easar extract "${BIN_S}/${atom_rpmdir}/resources/app.asar" \
-		"${BUILD_DIR}/app"
-
-	cd "${BUILD_DIR}/app" || die
-
-	eapply "${FILESDIR}/apm-python.patch"
-	eapply "${FILESDIR}/atom-unbundle-electron-r3.patch"
-	eapply "${FILESDIR}/atom-python-r1.patch"
-	eapply "${FILESDIR}/atom-apm-path-r2.patch"
-	eapply "${FILESDIR}/atom-fix-app-restart-r2.patch"
-	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-	eapply "${FILESDIR}/atom-fix-config-watcher-r1.patch"
-
-	sed -i -e "s|path.join(process.resourcesPath, 'LICENSE.md')|'/usr/share/licenses/$(get_atom_appname)/LICENSE.md'|g" \
-		./src/main-process/atom-application.js \
-		|| die
-
-	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|${node_includes}|g" \
-			-e "s|{{ATOM_PATH}}|${electron_path}|g" \
-			-e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
-			-e "s|{{ATOM_PREFIX}}|${EPREFIX}|g" \
-			-e "s|^#!/bin/bash|#!${EPREFIX}/bin/bash|g" \
-		./atom.sh \
-		|| die
-
-	local env="export NPM_CONFIG_NODEDIR=${node_includes}\nexport ELECTRON_NO_ASAR=1"
-	sed -i -e \
-		"s|\"\$binDir/\$nodeBin\"|${env}\nexec \"${node_path}\"|g" \
-			apm/bin/apm || die
-
-	sed -i -e \
-		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"${node_path}\" |g" \
-			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
-	sed -i -e \
-		"s|atomCommand = 'atom';|atomCommand = '${EPREFIX}/usr/bin/atom${suffix}'|g" \
-			apm/lib/test.js || die
-
-	rm apm/bin/node || die
-
-	sed -i -e "s|/${atom_rpmdir}/atom|${EPREFIX}/usr/bin/atom${suffix}|g" \
-		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
-	for binmod in "${BINMODS[@]}"; do
-		pkgdir="${WORKDIR}/$(package_dir ${binmod})"
-		cd "${pkgdir}" || die
-		if have_patches_for "${binmod}"; then
-			eapply "${FILESDIR}"/${binmod}-*.patch
-		fi
-	done
-
-	cd "${BUILD_DIR}/app" || die
-
-	# Unbundle bundled libs from modules
-
-	pkgdir="${WORKDIR}/$(package_dir git-utils)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "git;libgit2;git2" \
-		"${pkgdir}/binding.gyp" || die
-
-	pkgdir="${WORKDIR}/$(package_dir oniguruma)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "onig_scanner;oniguruma;onig" \
-		"${pkgdir}/binding.gyp" || die
-
-	pkgdir="${WORKDIR}/$(package_dir spellchecker)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "spellchecker;hunspell;hunspell" \
-		"${pkgdir}/binding.gyp" || die
-
-	pkgdir="${WORKDIR}/$(package_dir superstring)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle \
-		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
-			-DPCRE2_CODE_UNIT_WIDTH=16" \
-		"${pkgdir}/binding.gyp" || die
-
-	for binmod in "${BINMODS[@]}"; do
-		pkgdir="${WORKDIR}/$(package_dir ${binmod})"
-		mkdir -p "${pkgdir}/node_modules" || die
-		ln -s "${WORKDIR}/nodejs-nan-${NAN_V}" \
-			"${pkgdir}/node_modules/nan" || die
-	done
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EPREFIX}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local binmod
-
-	for binmod in "${BINMODS[@]}"; do
-		einfo "Configuring ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom configure
-	done
-}
-
-src_compile() {
-	local binmod
-	local ctags_d="node_modules/symbols-view/vendor"
-	local jobs=$(makeopts_jobs)
-	local unpacked_paths
-
-	# Transpile any yet untranspiled files.
-	ecoffeescript "${BUILD_DIR}"/app/spec/'*.coffee'
-
-	mkdir -p "${BUILD_DIR}/modules/" || die
-
-	for binmod in "${BINMODS[@]}"; do
-		local binmod_name=${binmod##node-}
-
-		einfo "Building ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom --verbose --jobs="$(makeopts_jobs)" build
-		mkdir -p "${BUILD_DIR}/modules/${binmod_name}" || die
-		cp build/Release/*.node "${BUILD_DIR}/modules/${binmod_name}" || die
-	done
-
-	# Put compiled binary modules in place
-	fix_binmods "${BUILD_DIR}/app" "apm"
-	fix_binmods "${BUILD_DIR}/app" "node_modules"
-
-	# Remove non-Linux vendored ctags binaries
-	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
-		"${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
-	# Remove bundled git
-	rm -r "${BUILD_DIR}/app/node_modules/dugite/git" || die
-
-	# Re-pack app.asar
-	# Keep unpack rules in sync with buildAsarUnpackGlobExpression()
-	# in script/lib/package-application.js
-	unpacked_paths=(
-		"*.node"
-		"ctags-config"
-		"ctags-linux"
-		"**/spec/fixtures/**"
-		"**/node_modules/github/bin/**"
-		"**/node_modules/spellchecker/**"
-		"**/resources/atom.png")
-
-	unpacked_paths=$(IFS=,; echo "${unpacked_paths[*]}")
-
-	cd "${BUILD_DIR}" || die
-	easar pack --unpack="{${unpacked_paths}}" --unpack-dir=apm "app" "app.asar"
-
-	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
-	# Replace vendored ctags with a symlink to system ctags
-	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-	ln -s "${EPREFIX}/usr/bin/ctags" \
-		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_install() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-
-	insinto "${install_dir}"
-
-	doins "${BUILD_DIR}/app.asar"
-	doins -r "${BUILD_DIR}/app.asar.unpacked"
-
-	insinto "${install_dir}/app"
-	doins -r "${BUILD_DIR}/app/apm"
-
-	insinto "/usr/share/applications/"
-	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
-		"atom${suffix}.desktop"
-
-	insinto "/usr/share/icons/"
-	doins -r "${BIN_S}/usr/share/icons/hicolor"
-
-	exeinto "${install_dir}"
-	newexe "${BUILD_DIR}/app/atom.sh" atom
-	insinto "/usr/share/licenses/${PN}${suffix}"
-	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
-	dosym "../..${install_dir}/atom" "/usr/bin/atom${suffix}"
-	dosym "../..${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
-	fix_executables "${install_dir}/app/apm/bin"
-	fix_executables "${install_dir}/app/apm/node_modules/.bin"
-	fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
-	fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
-	fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
-	local slot=${SLOT%%/*}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
-	if [[ "${PV}" == *beta* ]]; then
-		echo "atom-beta"
-	else
-		echo "atom"
-	fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
-	echo "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
-	echo "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
-	echo "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_node_includedir() {
-	echo "/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
-	"${BROOT}/$(get_electron_dir)"/node "${@}"
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
-	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
-	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
-	PATH="${BROOT}/$(get_electron_dir):${PATH}" \
-		enode_electron "${nodegyp}" \
-			--nodedir="${BROOT}/$(get_node_includedir)" "${@}" || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
-	local cscript="${FILESDIR}/transpile-coffee-script.js"
-
-	echo "ecoffeescript" "${@}"
-	echo ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
-	NODE_PATH="${BUILD_DIR}/app/node_modules" \
-		enode_electron "${cscript}" "${@}" || die
-	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
-	NODE_PATH="${BUILD_DIR}/app/node_modules" \
-		enode_electron "${cscript}" "${@}" || die
-}
-
-# asar wrapper.
-easar() {
-	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
-	echo "asar" "${@}"
-	enode_electron "${asar}" "${@}" || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
-	local binmod="${1//-/_}"
-	local binmod_v="${binmod^^}_V"
-	if [[ -z "${binmod_v}" ]]; then
-		die "${binmod_v} is not set."
-	fi
-
-	echo ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-have_patches_for() {
-	local patches="${1}-*.patch"
-	local found
-	found=$(find "${FILESDIR}" -maxdepth 1 -name "${patches}" -print -quit)
-	test -n "${found}"
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-fix_binmods() {
-	local dir="${2}"
-	local prefix="${1}"
-	local path
-	local relpath
-	local modpath
-	local mod
-	local cruft
-
-	while IFS= read -r -d '' path; do
-		relpath=${path#${prefix}}
-		relpath=${relpath##/}
-		relpath=${relpath#W${dir}}
-		modpath=$(dirname ${relpath})
-		modpath=${modpath%build/Release}
-		mod=$(basename ${modpath})
-
-		# Check if the binary node module is actually a valid dependency.
-		# Sometimes the upstream removes a dependency from package.json but
-		# forgets to remove the module from node_modules.
-		has "${mod}" "${BINMODS[@]}" || continue
-
-		# Must copy here as symlinks will cause the module loading to fail.
-		cp -f "${BUILD_DIR}/modules/${mod}/${path##*/}" "${path}" || die
-
-		# Drop unnecessary static libraries.
-		find "${path%/*}" -name '*.a' -delete || die
-	done < <(find "${prefix}/${dir}" -name '*.node' -print0 || die)
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-fix_executables() {
-	local dir="${1}"
-	local node_sb="#!${EPREFIX}$(get_electron_dir)"/node
-
-	while IFS= read -r -d '' f; do
-		IFS= read -r shebang < "${f}"
-
-		if [[ ${shebang} == '#!'* ]]; then
-			fperms +x "${f#${ED}}"
-			if [[ "${shebang}" == "#!/usr/bin/env node" || \
-					"${shebang}" == "#!/usr/bin/node" ]]; then
-				einfo "Fixing node shebang in ${f#${ED}}"
-				sed --follow-symlinks -i \
-					-e "1s:${shebang}$:${node_sb}:" "${f}" || die
-			fi
-		fi
-	done < <(find -L "${ED}${dir}" -maxdepth 1 -mindepth 1 -type f -print0 || die)
-}
diff --git a/app-editors/atom/files/apm-python.patch b/app-editors/atom/files/apm-python.patch
deleted file mode 100644
index 0467beaf10ee..000000000000
--- a/app-editors/atom/files/apm-python.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/apm/bin/python-interceptor.sh b/apm/bin/python-interceptor.sh
-index 7ce1965..12cc72f 100755
---- a/apm/bin/python-interceptor.sh
-+++ b/apm/bin/python-interceptor.sh
-@@ -34,9 +34,9 @@ case $1 in
-       ARGS+=("--format=safemake.py")
-     fi
- 
--    exec python "${ARGS[@]}"
-+    exec python2 "${ARGS[@]}"
-     ;;
-   *)
--    exec python "$@"
-+    exec python2 "$@"
-     ;;
- esac
diff --git a/app-editors/atom/files/atom-apm-path-r2.patch b/app-editors/atom/files/atom-apm-path-r2.patch
deleted file mode 100644
index 12234b6bab13..000000000000
--- a/app-editors/atom/files/atom-apm-path-r2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/config-schema.js b/src/config-schema.js
-index 39f0585..24ee2de 100644
---- a/src/config-schema.js
-+++ b/src/config-schema.js
-@@ -5,6 +5,11 @@ const configSchema = {
-   core: {
-     type: 'object',
-     properties: {
-+      apmPath: {
-+        type: 'string',
-+        "default": '{{ATOM_PREFIX}}/usr/bin/apm{{ATOM_SUFFIX}}',
-+        description: 'Path to apm executable.'
-+      },
-       ignoredNames: {
-         type: 'array',
-         default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
diff --git a/app-editors/atom/files/atom-fix-app-restart-r2.patch b/app-editors/atom/files/atom-fix-app-restart-r2.patch
deleted file mode 100644
index a2defa21db2f..000000000000
--- a/app-editors/atom/files/atom-fix-app-restart-r2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From bf4c1ab651a82eb369ffa3dc4b20246d043d797a Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Wed, 28 Mar 2018 12:02:53 -0400
-Subject: [PATCH] Fix app restart
-
----
- src/main-process/atom-application.js | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
-index 10b791761..d16a68fba 100644
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -1344,6 +1344,7 @@ class AtomApplication extends EventEmitter {
- 
-   restart () {
-     const args = []
-+    args.push("--app=" + this.resourcePath);
-     if (this.safeMode) args.push('--safe')
-     if (this.logFile != null) args.push(`--log-file=${this.logFile}`)
-     if (this.socketPath != null) args.push(`--socket-path=${this.socketPath}`)
--- 
-2.16.1
-
diff --git a/app-editors/atom/files/atom-fix-config-watcher-r1.patch b/app-editors/atom/files/atom-fix-config-watcher-r1.patch
deleted file mode 100644
index 7af82050d46b..000000000000
--- a/app-editors/atom/files/atom-fix-config-watcher-r1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5f1f840372611b8f42d8fd3be7b680f90958f015 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Wed, 28 Mar 2018 18:52:58 -0400
-Subject: [PATCH] Unbreak config watcher in the main process
-
----
- src/path-watcher.js | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/path-watcher.js b/src/path-watcher.js
-index 6693489ef..f3ddc6fe4 100644
---- a/src/path-watcher.js
-+++ b/src/path-watcher.js
-@@ -544,12 +544,22 @@ class PathWatcherManager {
-   // Private: Access the currently active manager instance, creating one if necessary.
-   static active () {
-     if (!this.activeManager) {
--      this.activeManager = new PathWatcherManager(atom.config.get('core.fileSystemWatcher'))
--      this.sub = atom.config.onDidChange('core.fileSystemWatcher', ({newValue}) => { this.transitionTo(newValue) })
-+      let config = this.getConfig()
-+      this.activeManager = new PathWatcherManager(config.get('core.fileSystemWatcher'))
-+      this.sub = config.onDidChange('core.fileSystemWatcher', ({newValue}) => { this.transitionTo(newValue) })
-     }
-     return this.activeManager
-   }
- 
-+  // Private: get config instance for the current application
-+  static getConfig() {
-+    if (typeof(global.atom) != 'undefined') {
-+      return global.atom.config
-+    } else {
-+      return global.atomApplication.config
-+    }
-+  }
-+
-   // Private: Replace the active {PathWatcherManager} with a new one that creates [NativeWatchers]{NativeWatcher}
-   // based on the value of `setting`.
-   static async transitionTo (setting) {
--- 
-2.17.0
-
diff --git a/app-editors/atom/files/atom-marker-layer-r1.patch b/app-editors/atom/files/atom-marker-layer-r1.patch
deleted file mode 100644
index 1dcdecbd4eba..000000000000
--- a/app-editors/atom/files/atom-marker-layer-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/node_modules/text-buffer/lib/marker-layer.js
---- b/node_modules/text-buffer/lib/marker-layer.js
-@@ -192,7 +192,7 @@
-         return function(markerId) {
-           var marker;
-           marker = _this.markersById[markerId];
--          if (!marker.matchesParams(params)) {
-+          if (marker == null || !marker.matchesParams(params)) {
-             return;
-           }
-           return result.push(marker);
diff --git a/app-editors/atom/files/atom-python-r1.patch b/app-editors/atom/files/atom-python-r1.patch
deleted file mode 100644
index 96d6b0327faf..000000000000
--- a/app-editors/atom/files/atom-python-r1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fae3881a3fa5bf58c696c5bd9c74c62a2113cb12 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Sat, 29 Sep 2018 16:12:39 -0400
-Subject: [PATCH] Use Python 2
-
----
- atom.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/atom.sh b/atom.sh
-index 0ad3f5b23..62fe682fe 100755
---- a/atom.sh
-+++ b/atom.sh
-@@ -62,6 +62,8 @@ if [ $REDIRECT_STDERR ]; then
-   exec 2> /dev/null
- fi
- 
-+export PYTHON=python2
-+
- ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
- mkdir -p "$ATOM_HOME"
- 
--- 
-2.16.4
-
diff --git a/app-editors/atom/files/atom-unbundle-electron-r3.patch b/app-editors/atom/files/atom-unbundle-electron-r3.patch
deleted file mode 100644
index 1a6ea109d05c..000000000000
--- a/app-editors/atom/files/atom-unbundle-electron-r3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 342dc685f8139e950924c04f1d460052e7531fb5 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 5 May 2016 17:23:35 -0400
-Subject: [PATCH] Unbundle electron
-
----
- atom.sh | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/atom.sh b/atom.sh
-index 935204bfc..0ad3f5b23 100755
---- a/atom.sh
-+++ b/atom.sh
-@@ -138,16 +138,21 @@ elif [ $OS == 'Linux' ]; then
-       ;;
-   esac
- 
-+  export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
-+  export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
-+  export LOCAL_GIT_DIRECTORY="{{ATOM_PREFIX}}/usr"
-+  ATOM_PATH="{{ATOM_PATH}}"
-+
-   : ${TMPDIR:=/tmp}
- 
-   [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
- 
-   if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+    "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-     exit $?
-   else
-     (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+    nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-     if [ $? -ne 0 ]; then
-       cat "$ATOM_HOME/nohup.out"
-       exit $?
--- 
-2.16.4
diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py
deleted file mode 100644
index 370221380b64..000000000000
--- a/app-editors/atom/files/gyp-unbundle.py
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env python2
-
-from __future__ import print_function
-
-
-import argparse
-import pprint
-import sys
-
-
-def die(msg):
-    print(msg, file=sys.stderr)
-    sys.exit(1)
-
-
-def do_unbundle(gypdata, targets):
-    gyptargets = {t['target_name']: t for t in gypdata['targets']}
-    dropped_deps = set()
-
-    def _unbundle_in_block(gypblock):
-        gypdeps = gypblock.get('dependencies') or {}
-
-        for dep, (libs, defines) in unbundlings.items():
-            if dep not in gypdeps:
-                continue
-
-            gypdeps.remove(dep)
-
-            try:
-                ls = gyptarget['link_settings']
-            except KeyError:
-                ls = gyptarget['link_settings'] = {}
-
-            try:
-                gyplibs = ls['libraries']
-            except KeyError:
-                gyplibs = ls['libraries'] = []
-
-            gyplibs.extend('-l{}'.format(lib) for lib in libs)
-
-            if defines:
-                try:
-                    dd = gyptarget['defines']
-                except KeyError:
-                    dd = gyptarget['defines'] = []
-
-                dd.extend(defines)
-
-            dropped_deps.add(dep)
-
-        gypconds = gypblock.get('conditions') or []
-        for cond in gypconds:
-            condblocks = cond[1:]
-            for condblock in condblocks:
-                _unbundle_in_block(condblock)
-
-    for target, unbundlings in targets.items():
-        if target not in gyptargets:
-            die('There is no {} target in gyp file'.format(target))
-
-        gyptarget = gyptargets[target]
-
-        _unbundle_in_block(gyptarget)
-
-    for gyptarget in gypdata['targets']:
-        if gyptarget['target_name'] in dropped_deps:
-            if gyptarget.get('dependencies'):
-                dropped_deps.update(gyptarget.get('dependencies'))
-
-    new_targets = []
-    for gyptarget in gypdata['targets']:
-        if gyptarget['target_name'] not in dropped_deps:
-            new_targets.append(gyptarget)
-
-    gypdata['targets'] = new_targets
-
-    gypconds = gypdata.get('conditions')
-    if gypconds:
-        for cond in gypconds:
-            condblocks = cond[1:]
-            for condblock in condblocks:
-                new_targets = []
-                blocktargets = condblock.get('targets')
-                if blocktargets:
-                    for blocktarget in blocktargets:
-                        if blocktarget['target_name'] not in dropped_deps:
-                            new_targets.append(blocktarget)
-                    condblock['targets'] = new_targets
-
-
-def main():
-    parser = argparse.ArgumentParser(description='Unbundle libs in gyp files')
-    parser.add_argument('gypfile', type=str, help='input gyp file')
-    parser.add_argument(
-        '--unbundle', type=str, action='append',
-        help='unbundle rule in the format '
-             '<target>;<dep>;<lib>[;lib][;-DMACRO]')
-    parser.add_argument(
-        '-i', '--inplace', action='store_true',
-        help='modify gyp file in-place')
-
-    args = parser.parse_args()
-
-    targets = {}
-
-    for unbundle in args.unbundle:
-        rule = list(filter(None, (i.strip() for i in unbundle.split(';'))))
-        if len(rule) < 3:
-            die('Invalid unbundle rule: {!r}'.format(unbundle))
-        target, dep = rule[:2]
-
-        defines = []
-        libs = []
-
-        for item in rule[2:]:
-            if item.startswith('-D'):
-                defines.append(item[2:])
-            else:
-                libs.append(item)
-
-        try:
-            target_unbundlings = targets[target]
-        except KeyError:
-            target_unbundlings = targets[target] = {}
-
-        target_unbundlings[dep] = libs, defines
-
-    with open(args.gypfile, 'rt') as f:
-        gypdata = eval(f.read())
-
-    do_unbundle(gypdata, targets)
-
-    if args.inplace:
-        with open(args.gypfile, 'wt') as f:
-            pprint.pprint(gypdata, stream=f)
-    else:
-        pprint.pprint(gypdata)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/app-editors/atom/files/transpile-coffee-script.js b/app-editors/atom/files/transpile-coffee-script.js
deleted file mode 100644
index bbea175b6721..000000000000
--- a/app-editors/atom/files/transpile-coffee-script.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict'
-
-const CompileCache = require(process.env.ATOM_SRC_ROOT + '/src/compile-cache')
-const fs = require('fs')
-const glob = require('glob')
-const path = require('path')
-
-function do_compile() {
-  let paths = new Set()
-
-  for (let pattern of process.argv.slice(2)) {
-    for (let path of glob.sync(pattern, {nodir: true})) {
-      paths.add(path)
-    }
-  }
-
-  for (let coffeePath of paths) {
-    let jsPath = coffeePath.replace(/coffee$/g, 'js')
-    fs.writeFileSync(
-      jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME))
-    fs.unlinkSync(coffeePath)
-  }
-}
-
-do_compile()
diff --git a/app-editors/atom/metadata.xml b/app-editors/atom/metadata.xml
deleted file mode 100644
index f35968a5e1fd..000000000000
--- a/app-editors/atom/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>cynede@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">atom/node-spellchecker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index b724938d61be..0947f916f1cc 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,3 +1,4 @@
+AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 830 BLAKE2B ccded20d0b24cf7a236a849bd8c3ebe350aba15038ea49bb499af0a7a4d9b29978b29d82e05963251ba45267ab2a471ec0a027e6c2e3fd5b6e124163b306b96b SHA512 f97dc85dcd00233d110ee2de507019e77dff40023b82e1413e7403625ffc976165c952e4026311ae647021bb0170e115374f8af81b41ceb0e5b065f82309867c
+EBUILD e3-2.8.2.ebuild 842 BLAKE2B 22e0ce8013a0ca6ce4666485677927d616016179a4cdcdf901dd82ee400a6380c301ce2c1e599f24cba945801c2c1fddc66407e60f88434ba8cc17667896402f SHA512 99cd2915430b264acf41f38bb21f65c9007d83c2568c2a4f74fa404993b4a7920834deaf1dad01896cb777bf9d9177b7b7e439b8b602803167c94c0bca474019
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index 4d675fa1428c..41f1d83154db 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 MY_P="${PN}-$(ver_rs 2 '')"
 DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
 HOMEPAGE="https://sites.google.com/site/e3editor/"
@@ -16,14 +18,10 @@ RESTRICT="strip"
 BDEPEND=">=dev-lang/nasm-2.09.04"
 
 S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i 's/-D$(EXMODE)//' Makefile || die
-	eapply_user
-}
+PATCHES=("${FILESDIR}"/${P}-makefile.patch)
 
 src_compile() {
-	emake -- $(usex amd64 64 32)
+	emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
 }
 
 src_install() {
diff --git a/app-editors/e3/files/e3-2.8.2-makefile.patch b/app-editors/e3/files/e3-2.8.2-makefile.patch
new file mode 100644
index 000000000000..5a22ff67e09d
--- /dev/null
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@@ -0,0 +1,36 @@
+--- e3-2.82-orig/Makefile
++++ e3-2.82/Makefile
+@@ -17,6 +17,8 @@
+ NASM_OR_YASM=nasm
+ #NASM_OR_YASM=yasm
+ 
++LD=ld
++
+ EXMODE=SED
+ 
+ #----------------------do not edit below line-------------------------------
+@@ -41,12 +43,12 @@
+ 
+ 32:	$(ASOURCES) Makefile
+ ifeq	($(OS),LINUX)
+-	nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE) 
++	nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS)
+ 	chmod +x e3
+ else
+ 	echo $(ASVER)
+-	nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE)
+-	ld -s -o e3 e3.o
++	nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS)
++	$(LD) -s -o e3 e3.o
+ 	strip --remove-section .comment e3
+ endif
+ 	ln -sf e3 e3ws
+@@ -60,7 +62,7 @@
+ 64:	$(ASOURCES) Makefile
+ 	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
+ 	$(ASSEMBLER64)
+-	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
++	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
+ ifneq	($(DEBUG),true)
+ 	strip e3
+ endif
diff --git a/app-editors/ee/Manifest b/app-editors/ee/Manifest
index c4e3dbe166d1..872f602c8f4b 100644
--- a/app-editors/ee/Manifest
+++ b/app-editors/ee/Manifest
@@ -1,6 +1,7 @@
 AUX ee-Wformat-security.patch 675 BLAKE2B 2fc022761f61081616565ab2161094aa40b6b13345063ddc59621878dd35153b24bc3bedc03cf7187d48434c34b331c6201c3577dce96d10983c3c4e3102aff2 SHA512 d6b8dc118c3381da71ea7d10673af52d8d36575480a274d5e0f30645e86b082d5381ee7682fcf9b253b621ba9138a350b132875ecdc9b2fb5ed75bd111ce5304
+AUX ee-gcc-10.patch 352 BLAKE2B 7e1d9bbb12d21445117d108f666884959fa239f2c7a48e23b3c5408e300d7c15c760879a6d86d85c90b943823cfaacc83ef9050eeccf5ba8a63d26eb0ef1153f SHA512 58a5795e4bac9ef910b10201af69c9fbe99caf6ddfe8346873eba5de32fdbcd4b18cfb57c76a9c26faeecfe6fe2bbb7503e5ca9eb03a73a0ee7b003c5bdd7014
 AUX ee-init-location.patch 1280 BLAKE2B ad20c44a30c9b817af997966d191640860def4a7f1dd63678f4befc8390ce22f254d802b4c75998ad874551ef90aff727273b6abde60f28f92412a9ce6507cbc SHA512 69732f151f7d8e9779c6826c89e92e9e4b5a8ab1580b8de562897a322e61514e3225eaecb9e2bf9fdf7063a126382ea9ba9ff7c233b2bebd8d4062b61b20375a
 AUX ee-signal.patch 222 BLAKE2B a514c6d060fde8c71d7a0dbb22d1d6843c9195500e5b675cda79645785a965f20144d26e558daf4f2acb6dd81d735ee4929991ea40d7bf88e091769951b20830 SHA512 9ce2f028d131b2ca47070002603b40c6841e8c69448cf419128cbf9519df928249de0fa7d1c9e906ea2a0368e8b6f9603ab26e8d0d352cc647e2ca9c5a93213c
 DIST ee-1.5.2.src.tgz 69651 BLAKE2B 2d79b889ad5c97d4f2e134acec235f8f1dfbf0c697936de326be448e0bb193f06cbaeadf5a99050fc47f0526bbeb571522513f363695190c1801c62aee1594f2 SHA512 9ca0e82d65971b0bce38e09c365b6eb8b81ca6ff5b244107ae254322e47e841e7f5345bf242a0a9dd66b731d46cead6f442016b9e070a1298e1a5319b1d7b97a
-EBUILD ee-1.5.2.ebuild 1127 BLAKE2B d4071be3623f1790e3e0c68672bfd16526f4e0809cc16b3e10ab4e8980a662c93c9601aa7d338c49ec4de9e68f6323f87743bbfd2d199472e7c628ecfcdefe33 SHA512 b1d70ea533e12104f926d7cd8320a86f11bbc5fa5b066c1512d977b8b8111f7e644231d41f1213a8aa3845bfa4a8548b872e575c590384a47867f29bdc657b3e
+EBUILD ee-1.5.2.ebuild 1158 BLAKE2B 34e78c6c8d75e7639b1cfdfcb962b0586ea216ea3687ff806b39ab48464f404ea0c4edfdf245b2ed73b9f930cf026974f0e79d8f319e55b2a9a0800dd6790e96 SHA512 24b7e86d667ddc6f0fc8cb4b1b26b0c62d17be77c0cd7b8d54c19acfcfb1378d5bba4980655ccbeb32ed7e7c15c3c858c4f0822657e1ca98b759567d4cbbf797
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
index fc1aec479af4..ad4bb78c8530 100644
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-init-location.patch
 	"${FILESDIR}"/${PN}-signal.patch
 	"${FILESDIR}"/${PN}-Wformat-security.patch
+	"${FILESDIR}"/${PN}-gcc-10.patch
 )
 DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
 
diff --git a/app-editors/ee/files/ee-gcc-10.patch b/app-editors/ee/files/ee-gcc-10.patch
new file mode 100644
index 000000000000..2577d76f25f6
--- /dev/null
+++ b/app-editors/ee/files/ee-gcc-10.patch
@@ -0,0 +1,22 @@
+--- a/new_curse.c
++++ b/new_curse.c
+@@ -83,6 +83,8 @@
+ #endif
+ 
+ 
++struct _line *top_of_win;
++
+ WINDOW *curscr;
+ static WINDOW *virtual_scr;
+ WINDOW *stdscr;
+--- a/new_curse.h
++++ b/new_curse.h
+@@ -161,7 +161,7 @@
+ 	int number;
+ 	};
+ 
+-struct _line *top_of_win;
++extern struct _line *top_of_win;
+ 
+ typedef struct WIND {
+ 	int SR;		/* starting row		*/
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index fe4e90b6f560..95589b3e2503 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,13 +10,15 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
 DIST emacs-27.0.90.tar.xz 43706980 BLAKE2B 87f9b621305711d7083307fbf921a32e7a878c6eef7939100511f669fdf052d88d8aea3c46a2c9fb9e9383c47c4066ec580443b2b24e510a6894d59caf9825ec SHA512 1a6f319e964f20ad35574eb2d2e18ae8c86d9d2ab9ae038334f0f468c40602d1f9b20880cfa704ea2067bdd7a3952ea3e6b565d5bb3d6d304922ad1d98c1c76b
+DIST emacs-27.0.91.tar.xz 43730296 BLAKE2B 9ed0f425539cd22b84e3c1e2973d6a66d983e6b6de5fff30c1db2ca3fb1d761cf2c4de566b28dcffff858d032ff996a528e14daaecc45eb71aa07c3f3a6e4a74 SHA512 fcae087c7d153ce45640dc5785e0829e85b14400eec70f833e1f7ee7d3903f1e4adb469d812596fc6e7ff792ccaeda3fde5fa1c37b609ab83e8432d9f63be36a
 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
+EBUILD emacs-23.4-r18.ebuild 10977 BLAKE2B 8e44c5f9f219081485ad0e923400e31cac34f76eea114f7e1d1619e884383680bfa2926966664c3a298bdf75dbb85f3b90dfc94b51f1b7c7669978c7e630dabc SHA512 e1ae3906e405d95e724ca3b79655a7e27eb4881d7a5589a7df383caf96a24f26f275f043ce54c0478130a711b0e1d06108c3943613088969f976883ab5fd9e5c
+EBUILD emacs-24.5-r7.ebuild 10764 BLAKE2B bb9a3be1061b105c1c4eee45ce983e80b0a914dd3848951bac2ae4ace4b7b7a830741169d1e75ea85753247310eae94066a739da76dfeb0bcf6c43b7b1418a3e SHA512 5079762e2e811379dfa5ab124b0574d93aa2c2a01998426e92bec83ed2fcae5b11a7efd49ffb23f95ed3dad5ee5b8d2cd60261c716ee4bce4082499acadcf273
+EBUILD emacs-25.3-r6.ebuild 11100 BLAKE2B 18140ddfd34e3434632cb6953a64764df34950024b08f459e57846886b456769d1a0467342ac5bb0797502a589600777aa5d9659d98e7db68f3aec3b8d6db6b9 SHA512 72d7d3cc11214324da56dbb4d2c57750b73bb085feb1e353f5d690066fd0b06e3ecbe617c4778a42078ef45de3745628e9b406bcaa6c4bf1d6ead2f0a19106c6
+EBUILD emacs-26.3-r1.ebuild 11887 BLAKE2B c598a530fcb8c470d8f8d4d3a1106bd8acddb2d03e660be00282fa173d87c68585ca7cf171d64c3d11bdf0cdb5e3ef7e2b54db67fb93af03e66f9575802d5032 SHA512 40e57173380373d8855f6f599d25417dc468da51483109054d1df4b8eea85a53f10e85f958e405d8bf7948bc61e19afa412da7a51755f7ea3c907bd598aa7359
+EBUILD emacs-27.0.50_pre20191223.ebuild 12898 BLAKE2B ebeef6a8ea281e8549fe6eafaeac049e66f24a18c4bc65358afc8a5ea89b8cac9b51d554f4b2e4881ae43a8b41b8bb02bf37a719c03e1b3bd4d0a5740662308b SHA512 89ec7e4c0f2e4ee776e28d8da10666e712b076817a7c34a31f74d9c9173f6ec4a9857016c4c2b6a8b3bace442bd49b8ecfb1814cf49f8479f1bafc4370f15261
+EBUILD emacs-27.0.90.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
+EBUILD emacs-27.0.91.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
+EBUILD emacs-27.0.9999-r1.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
+EBUILD emacs-28.0.9999.ebuild 12871 BLAKE2B 7aa3322befb032b60349d2b5ba2311429b3110428130cd0552bb2397dfd7c89ebad55f8f6f9fc576287c1af162e7d43145393be3e693c27e3fdfad00102e37bf SHA512 11d00e05d8053659dc025755262f46c9d8e4b37aba4492b366f9bda19edc5e9a46932a543410377c9dc6d17a01495b36592bb9f163f5d3fa968aa16e5ba27b03
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index ea117e496500..a84fad2f8d3a 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -125,9 +125,7 @@ src_configure() {
 	append-flags $(test-flags -fno-strict-aliasing)
 	append-ldflags $(test-flags -no-pie)	#639568
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 7393476a40c2..e82a60ec1c26 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -118,9 +118,7 @@ src_configure() {
 	filter-flags -pie					#526948
 	append-ldflags $(test-flags -no-pie)	#639570
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 72d0e9f62796..18e79d8a04ad 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -121,9 +121,7 @@ src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 22c804c1e050..2d976a0d1f76 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -127,9 +127,7 @@ src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
index c6db7de6525f..b16211b43e36 100644
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
@@ -153,9 +153,7 @@ src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild
index b006e62dabae..6b20eefd9d28 100644
--- a/app-editors/emacs/emacs-27.0.90.ebuild
+++ b/app-editors/emacs/emacs-27.0.90.ebuild
@@ -153,9 +153,7 @@ src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-27.0.91.ebuild b/app-editors/emacs/emacs-27.0.91.ebuild
new file mode 100644
index 000000000000..6b20eefd9d28
--- /dev/null
+++ b/app-editors/emacs/emacs-27.0.91.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="27-vcs"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
+				x11-libs/gtk+:3
+				xwidgets? (
+					net-libs/webkit-gtk:4=
+					x11-libs/libXcomposite
+				)
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use gtk2; then
+				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+				use xwidgets && ewarn \
+					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
+			else
+				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		if ! use gtk; then
+			use gtk2 && ewarn \
+				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+			use xwidgets && ewarn \
+				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-dumping=pdumper \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+#src_compile() {
+#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+#}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
index b006e62dabae..6b20eefd9d28 100644
--- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
@@ -153,9 +153,7 @@ src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 462168b70483..fbe5d94d188c 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -152,9 +152,7 @@ src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
 
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
+	if use ia64; then
 		replace-flags "-O[2-9]" -O1		#325373
 	else
 		replace-flags "-O[3-9]" -O2
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index ab34127f9227..337c014f11a2 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,4 +1,5 @@
 AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
+AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b
 DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
-EBUILD fe-2.0.ebuild 784 BLAKE2B f4639eb6e54589ba2c6b3b6cac195859585d8b422eee73062f0bda9d95eb6ae340d6f35165a20c32402814b9fcb9c49678f6925658b8a252e6ada23a940b7ed0 SHA512 1f7dc3bdd3a7c04c3ee0bbb0f90dabfc0814edaee82e97cc3aacd5633337e5a42660b1ac45d03080af38bee522184f76731d91304d4b513301b9bb4be28403a1
+EBUILD fe-2.0.ebuild 859 BLAKE2B 600346c9cd0ea2ffa6795579dfb05eb5af3307e9e63531049b717db05fcd140136d0c8d005cb0fc388e24c24c55cfeb6992cf324b782a9177f137c44f88b5b9f SHA512 d09002589b3c4a279131ce179bdade3772971980ad9bad00d3b9023b49f1a34e237fd083bb1b76001bfaece4608c54cbe26b72e0a9147e922bf9f1289a44513b
 MISC metadata.xml 1259 BLAKE2B e393bad45601c7e357aa4c4e5e6ede35cdd6758a1cc251cfc3acca0e8526ffb696c0ca484b312be14d23a05d8996ce7fb3bee37fe7a8c9bc72d5c507c26729df SHA512 6539d808d3cd85bab1985dbfb69ddbd01166a4e6dcf66d0f138d1ff1e52d9b7342ff3b468e031f9372308533296e28eb978b00954624890a897b5f41c222f701
diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0.ebuild
index ca6658d94079..207e9ec3f773 100644
--- a/app-editors/fe/fe-2.0.ebuild
+++ b/app-editors/fe/fe-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,10 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=("${FILESDIR}"/${PN}-1.8-makefile.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-makefile.patch
+	"${FILESDIR}"/${P}-ar.patch
+)
 
 src_configure() {
 	econf \
@@ -27,6 +30,10 @@ src_configure() {
 		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
 	emake \
 		prefix="${D}"/usr \
diff --git a/app-editors/fe/files/fe-2.0-ar.patch b/app-editors/fe/files/fe-2.0-ar.patch
new file mode 100644
index 000000000000..8096400ab01e
--- /dev/null
+++ b/app-editors/fe/files/fe-2.0-ar.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/722036
+
+--- fe-2.0-orig/Makefile.in
++++ fe-2.0/Makefile.in
+@@ -15,6 +15,7 @@
+ CPPFLAGS=	@CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\"
+ LDFLAGS=	@LDFLAGS@
+ LIBS=		@LIBS@
++AR=		ar
+ 
+ CATALOGS=	de.mo
+ OBJS=		buffer.o complete.o display.o macro.o misc.o msgline.o
+@@ -27,7 +28,7 @@
+ 		$(CC) -o $@ $(LDFLAGS) fe.o libfe.a $(LIBS)
+ 
+ libfe.a:	$(OBJS)
+-		rm -f $@; ar q $@ $(OBJS); @RANLIB@ $@
++		rm -f $@; $(AR) q $@ $(OBJS); @RANLIB@ $@
+ 
+ install-po:	install-po-@USE_NLS@
+ install-po-no:
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 4e5c38b28d3c..b4cad180b4da 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,7 +1,6 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
-AUX focuswriter-1.7.5-qt-5.15-build.patch 617 BLAKE2B 447181cde3df87ab181982afd45f1f2472440324d0dfe58de81f37cb07683923544943c755752e6562f0f566f273b2858bef17c0d787decd70431025b4613d29 SHA512 2426de757e0b26378c21032be5127fe9468e7fdeec2d287b2a0be3c830980c4d1087f1c297e7ecdc2863a5c407cb5f7ddae1293e1ad602d3726ea26ea5f02db0
 DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf
-DIST focuswriter-1.7.5-src.tar.bz2 10311298 BLAKE2B c495aced12e2e4deea1b602a0d1e2f97adbf2c91edf94302978fbeca9e33807e20fc05db2758ee05fc4c54ee7281cca10b6c01b70f2859899a6b227235e7aed0 SHA512 b9b533180160c5395eee8b921cf05f56e13eb48db402d352359854b419bd5367f21bac1b07fb80d4bb59ab019a7051bb9aeb1321e35a8f9d250a9584475def8b
+DIST focuswriter-1.7.6-src.tar.bz2 10311965 BLAKE2B a1f1627df988d7660f6b90cf984d725ff2366754f01b0ce78e23756a98c716acafa8b4076f4749f117cba6eaabcb6ec61516c032a7ae770eb1b06466a358595e SHA512 45e0bc9b20c73b260aa42dcc9ee79515d3ad95d4c9586f60ab75fb404f73c7443484f238b3705ba3224b852a0d9b8b8db17d9145aebb77513f8597a01ab01d3b
 EBUILD focuswriter-1.7.2.ebuild 914 BLAKE2B cefbcd3addb8d18a80e419984d003275b16c3c6d5ba6bfd552687e540d846e7a075f7bb0f3d6fa6ff91bed484676c2370ce5275cde33fc0b6cc0030b477fdead SHA512 e835fa1bb106885f9abcf733363e4b463f60bd8d315b00b7f46b4c71bc6d2892e4630812209d471f8360e328f3a806b1b2c942bae49b1c511a9ec57138f6b5ea
-EBUILD focuswriter-1.7.5.ebuild 964 BLAKE2B 10be3ed8961f4c9fcc11e624dc263007c86c2831207adf6cefae23f992e237a0b54b4cb705740bb3c64aa00b43628161fddb098de086d3baade772cb573ddc81 SHA512 2c410cee655a68e181821018eb36e78a3bf76639920c310ec64e6f81d38535a5cb9e84a501ac82bde67a9d05e8e5fd627e902efe61918e5a817f9d1c40148d3c
+EBUILD focuswriter-1.7.6.ebuild 916 BLAKE2B bcc45cca8caeb94dd1c11133a5e22296c28b541f5e2c1812d5626833e1eb8485362b332b50e426522f54047e03faf104b3afa193a36fb8e6eda210a084ec7b83 SHA512 e8cb2e2d229289a80035adc5b831f6db28b3b188e4e97e1d137c9b5363bda4d21d41c4f4fc0398443d5191260e828404c44123c23ef1ba1f8eee85f6e3e53732
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch b/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
deleted file mode 100644
index c59946f354fa..000000000000
--- a/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 026fb9b1fbfa8040815ac524b6002f93b6411d45 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Mon, 20 Apr 2020 22:58:48 +0300
-Subject: [PATCH] Fix build against Qt 5.15.
-
-Due to a change in Qt, 'QPainterPath' needs to be explicitly
-included.
----
- src/theme.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/theme.cpp b/src/theme.cpp
-index 4708338..59551ea 100644
---- a/src/theme.cpp
-+++ b/src/theme.cpp
-@@ -27,6 +27,7 @@
- #include <QFile>
- #include <QImageReader>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTextEdit>
- #include <QUuid>
--- 
-2.26.1
-
diff --git a/app-editors/focuswriter/focuswriter-1.7.5.ebuild b/app-editors/focuswriter/focuswriter-1.7.6.ebuild
index de11e6825890..da9506014d16 100644
--- a/app-editors/focuswriter/focuswriter-1.7.5.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.7.6.ebuild
@@ -34,10 +34,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog CREDITS README )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch"
-	"${FILESDIR}/${PN}-1.7.5-qt-5.15-build.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
 
 src_configure() {
 	eqmake5 PREFIX="${EPREFIX}"/usr
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 43d8990db408..9a92ffaedde5 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,7 +4,9 @@ DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783a
 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
+DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 EBUILD gvim-8.2.0360.ebuild 10326 BLAKE2B 4fd00bb56f9cac3143d22d7d080046a4ac76a8d64b13ede6614527aa5c69603b792f5b0ec5efb9284978a1c782454211bf23ed25fb96e6994352602bc97b350e SHA512 37b60dcc8805c6aef6e1b1a3bb93fa96ad6b12a66614f30858018f369843d77ab57040656b710fd818bc2c823a43202ce52dff5a6aff1e1912298a72e51ea2cd
 EBUILD gvim-8.2.0508.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
+EBUILD gvim-8.2.0638.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
 EBUILD gvim-9999.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0638.ebuild b/app-editors/gvim/gvim-8.2.0638.ebuild
new file mode 100644
index 000000000000..3542682bc039
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.0638.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-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/~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
+
+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-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	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 )
+"
+
+# 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 python3interp)
+		$(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
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 88e7a72e4f4e..5dd25b899f54 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1,8 +1,9 @@
+AUX hteditor-2.1.0-AR.patch 362 BLAKE2B 7698e475679e730f4e5642f1acfc802170810699209c6e68d6587075bf95502eaec18e618b065b4072178e9d4371628331af1d867495c7283380facc07594a24 SHA512 3b656378c025e94fa480b942ae9ce073b9af33a062ba9806d3baeb2b091df1a186eee87e58e1ddcb9823c97db4a68f0f69ee0584aa0b4bfb03f487bc28dcf7c4
 AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f
 AUX hteditor-2.1.0-gcc-10.patch 989 BLAKE2B f4678cfa1eccc741005d4a51d4c74f4d01c0f62594b1f138121758db26b24c4a588430a43f4cae5d9b6f4032236c4f6478b385542e060c37225859d9cd78ba93 SHA512 2fceb761e1ef4225917a66db2fabac1a38072e83ce0fdfa9bdc592d34f9f7870c2a0aae971a4ebe7baffb52203f6b7b906e57f672925fbaf0c8ca77fcebf1a2d
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1245 BLAKE2B a09a2fd5338de9df7f5f7effe9692d0c80be642a0362f38b0fecb45224161de4b2a926662e8cb52b4b802ff6fc47f67fc258faf96e66dd93cc818ad0573f14b8 SHA512 d4be8a225b7c710b6350b70113cfadb869b4bf7a4a953871550d613f3183a0a5888e8cf36a87ad17ec25a57c392587719a745bd97ca2cbe75ef5b3206bb017f1
+EBUILD hteditor-2.1.0-r1.ebuild 1189 BLAKE2B 9f8d20d19df3f7d853e2a6a7fa132a595ebbad5ff0837d247f2ed14cc886e0e517d72ad7dbbb200aecb23f3154cd308761615237c054d3edd1785ff9c98fa324 SHA512 8a2e8a8271926882de6f878aee001c54324730c621a1a83d32fed7c3c4ebddd65fd2ee3e83250e1e60ea7626c472236d42e98258b32ee59778ceaa9b9bf0e793
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
new file mode 100644
index 000000000000..60a0427a2125
--- /dev/null
+++ b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/722040
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,8 +104,8 @@ AC_PROG_CPP
+ AC_PROG_CXX
+ AC_PROG_YACC
+ AM_PROG_LEX
+-AC_PATH_PROG(AR, ar)
+-AC_PATH_PROG(AR, gar)
++AC_CHECK_TOOL(AR, ar)
++AC_CHECK_TOOL(AR, gar)
+ 
+ if test "x$AR" = "x"; then
+ 	   AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***])
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 44b7dd140f67..16a7ab4322f0 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc-6-uchar.patch
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-AR.patch
 )
 
 src_prepare() {
@@ -46,10 +47,6 @@ src_configure() {
 		--enable-maintainermode
 }
 
-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
 src_install() {
 	#For prefix
 	chmod u+x "${S}/install-sh"
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 90ff951ea773..82f21ca0b64a 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,9 +1,5 @@
-DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
-DIST pluma-1.22.1.tar.xz 3236724 BLAKE2B f571ccb79ffac11122dad1888a9804fdb1671f2c73b28c216e0ec593ffc4dac3fec3053b83fd1503e0c951e032f6e4c22fb4f3d6a1d23477a54e06de2659222e SHA512 0d3f07b2e8c736c9e1ad64ed5cb749db6088868e9bc27aa786cbb0c3fe72715f0fd4dd53999502a4333ec82110148b772c0dde81433d0936d2d3c2d04804026a
 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
+EBUILD pluma-1.22.2.ebuild 1763 BLAKE2B fdaa40798715c30416e583d6ce689f2c16694f5d3ea74a9da722680f44ff2f6a8cb5d037b316617a58b4758ffc70c091acf621735471312f3b2c8034f4f807a0 SHA512 9966f165a8a795a5bc0f79d9c8092a4189a21955ebe958d4e07eb24be0ef7307dc3e3da1ccb89483af7abeab63dd697767031423eef98d35006d6b43151883b7
+EBUILD pluma-1.24.0.ebuild 1782 BLAKE2B 5338be90c3f64ec38bd7deaa99a813269dba08104c5577a96560e170a3402df4de0d85b6ddddeb0f223a4390b519b90696dc2eedd019c329e30618efc52dc4a3 SHA512 026999eb91c75206fdcef88ba1b3844278b5519ac3c3b957effb23e2b7506b27ec6d0040e5018493aa4f176ac57ccad139ce18d75336b8bdefc837a47b357eec
 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
deleted file mode 100644
index 8760273f0a9a..000000000000
--- a/app-editors/pluma/pluma-1.22.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.2:=
-		>=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.22.1.ebuild b/app-editors/pluma/pluma-1.22.1.ebuild
deleted file mode 100644
index f1278f5501c6..000000000000
--- a/app-editors/pluma/pluma-1.22.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.22.2.ebuild b/app-editors/pluma/pluma-1.22.2.ebuild
index f1278f5501c6..1ed9fe553283 100644
--- a/app-editors/pluma/pluma-1.22.2.ebuild
+++ b/app-editors/pluma/pluma-1.22.2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit mate python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
index b4b41684ccc9..ae1a569e5bee 100644
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ b/app-editors/pluma/pluma-1.24.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MATE_LA_PUNT="yes"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit mate python-single-r1 virtualx
 
diff --git a/app-editors/sandy/Manifest b/app-editors/sandy/Manifest
index 9441cf85577f..89d1cfe75ccc 100644
--- a/app-editors/sandy/Manifest
+++ b/app-editors/sandy/Manifest
@@ -1,4 +1,5 @@
 AUX sandy-0.4-gentoo.patch 1019 BLAKE2B 8aafad7b55d55fee1e48105f77b321929e306341cb318a89cc500089249988de33fba50a67a24a7868f1d6737a3130717cd38b40a132a28f36da1e1248da4053 SHA512 06e3e4dd2979e3589f9f1205eee13c56006ea4f2d8d8ead61faadebcdc9b590c82b645dc93b6ed6693cd15cd8d7e45491812fa3fb0819cfd088e5e231da7f7ab
 DIST sandy-0.4.tar.bz2 18409 BLAKE2B bb10bc7def440d436ffa0304c8f009d722b23159fdd8f2b559f768476391ba2ddda9083ef6fd7e0cec32b231d3c6fa9578214e5027b8a4cd490d338b384ea83a SHA512 6f28588e15ccdc467dd9d0de8b221508333defefe5866005d82292583db9f296284f233271af5e85b648c194dff117f94752cc364ed6c1409dae5c3af755b530
+EBUILD sandy-0.4-r1.ebuild 749 BLAKE2B c7b400388121ba9e0fe189c77acda73b56f6fae519a39ae39f494bc6082c37bad46b2c10e240e7ee4d4e4967e1a50cfb03c87ece7e7240b9456040f0de17e8f5 SHA512 950c9417523e97699628ed114d8273e8ff52517f760dc4eefe920f52165dbfd61b99f5d5e38877aa236797353ed3276b4517c0727291d2a73aaf2076217af7af
 EBUILD sandy-0.4.ebuild 680 BLAKE2B d7133d25632aa6f321dbf51970b2bb8c629e9be3b0fbeedacf7e11d93e065b1b11f2896251676d34e31acfc334e7577236036297a76cdf8621581f50693a8056 SHA512 1bd2f870bca21d66e7d53ede12c92bea99fcec61c970b7ba885f438f9e43584bbe340ee780e0e0410d2c9e5701088db9db06331e65156bc925c8a680ef709695
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/app-editors/sandy/sandy-0.4-r1.ebuild b/app-editors/sandy/sandy-0.4-r1.ebuild
new file mode 100644
index 000000000000..d6f94b34f70f
--- /dev/null
+++ b/app-editors/sandy/sandy-0.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="an ncurses text editor with an easy-to-read, hackable C source"
+HOMEPAGE="https://tools.suckless.org/sandy"
+SRC_URI="https://git.suckless.org/${PN}/snapshot/${P}.tar.bz2"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	sys-libs/ncurses:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-gentoo.patch
+)
+
+src_prepare() {
+	default
+	restore_config config.h
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	append-cflags -D_DEFAULT_SOURCE
+	emake PREFIX=/usr ${PN}
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	save_config config.h
+}
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index ae99d2254e5d..1d23282e00ca 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -2,8 +2,10 @@ DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f3
 DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
 DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
+DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
 EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
 EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
 EBUILD scite-4.2.1.ebuild 2939 BLAKE2B b1068efcac9794f133bcb5b059f030d8d804c501d229525b8985112f2c245be60a0b3a49e3a46dae901d37790f669784ba542005fe266aae99eb4240a64965e1 SHA512 921c777969f1f7a307eba9b073d151691c4b11faeec2e84c88ecb0cf5b6c7965109b1a35924e3a59859878976da842345a0042d5667e03672bf2a439f619de47
 EBUILD scite-4.3.2.ebuild 2823 BLAKE2B a02e1ca319d0b1b5e60ab1ba28266cce1458cb1b01e314b3eb6ca06f70a065a26c20c965852d0d56f1c44da0745f92ea2d9b6ba8b21d3bed26b0f72c7bbae887 SHA512 e234e7259d0f93c32c9b487f0eef966746d84989d44d81b5234b8728a907453beef39ee43e7f67d4ac934cc8c32441589b1a0438ec565784acf7c9a96ede65a0
+EBUILD scite-4.3.3.ebuild 2823 BLAKE2B a02e1ca319d0b1b5e60ab1ba28266cce1458cb1b01e314b3eb6ca06f70a065a26c20c965852d0d56f1c44da0745f92ea2d9b6ba8b21d3bed26b0f72c7bbae887 SHA512 e234e7259d0f93c32c9b487f0eef966746d84989d44d81b5234b8728a907453beef39ee43e7f67d4ac934cc8c32441589b1a0438ec565784acf7c9a96ede65a0
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
new file mode 100644
index 000000000000..e34188a5587f
--- /dev/null
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+DOCS=("../README")
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_pretend() {
+	if tc-is-clang ; then
+		# need c++17 features
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(clang-major-version) -lt 5 ]] &&
+		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
+		($(clang-major-version))."
+
+	elif tc-is-gcc; then
+		# older gcc is not supported
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(gcc-major-version) -lt 7 ]] &&
+		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
+	else
+		die "Either gcc or clang should be configured for building scite"
+	fi
+}
+
+src_prepare() {
+	# remove hardcoded CC, Optimizations and clang unknown flags
+	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
+	-e "s#^CC = gcc#CC = ${CC}#" \
+	-e "s#^CC = clang#CC = ${CC}#" \
+	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#-Os##" \
+	-e "s#-Wno-misleading-indentation##" \
+	|| die "error patching /scintilla/gtk/makefile"
+
+	sed -i "${S}/makefile" \
+	-e "s#^CC = clang#CC = ${CC}#" \
+	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+	-e "s#-Os##" \
+	|| die "error patching gtk/makefile"
+
+	# repair and enhance the .desktop file
+	sed -i "${S}/SciTE.desktop" \
+	-e "s#text/plain#text/\*;application/xhtml+xml#" \
+	-e "s#^Categories=\(.*\)#Categories=Development;#" \
+	|| die "error patching /scite/gtk/SciTe.desktop"
+
+	#  add the ebuild suffix as shell type for working with ebuilds
+	sed -i "${WORKDIR}/scite/src/perl.properties" \
+	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+	|| die "error patching /scite/src/perl.prperties"
+
+	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
+	# Bug #576162
+
+	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
+	eapply_user
+}
+
+src_compile() {
+	# prepare make options
+	local emake_pars=("GTK3=1")
+
+	tc-is-clang && emake_pars+=("CLANG=1")
+	use !lua    && emake_pars+=("NO_LUA=1")
+
+	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
+	emake "${emake_pars[@]}"
+}
+
+# want to use the base src_install() as base_src_install()
+
+src_install() {
+	default
+	dosym SciTE /usr/bin/scite
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index 18b36eb54ddd..dd3e3ca2fbcc 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,7 +1,5 @@
 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
+EBUILD texworks-0.6.5.ebuild 1387 BLAKE2B fc8cadb7a3cc17ff450705d0925946891b75f0d574d9bed6ce50e5ccd3a739353e522035683d70d877a54511fcf16d43fc4b1c688b4860869b135b2abb3455a8 SHA512 8991744543c3f456733e10e264ef6311312309408162c5daff459c6c5f7067b1abd49b20d5f116d4718b77d10bfa04414a5098a1c6ee6a0933865a9ab88fbc91
 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
deleted file mode 100644
index 5a37d1418bb6..000000000000
--- a/app-editors/texworks/texworks-0.6.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
index 5a37d1418bb6..d9fa4f242770 100644
--- a/app-editors/texworks/texworks-0.6.5.ebuild
+++ b/app-editors/texworks/texworks-0.6.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lua python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 3e42e5e25d44..b9c23463d38d 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -5,7 +5,9 @@ DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783a
 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
+DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 EBUILD vim-core-8.2.0360.ebuild 6906 BLAKE2B 1ecc1f692f3ff39c6b118dcd1e164075ad1bf333c44201fb28a24b15d97219eccaa1a3eafa9f31c7964d666f0bfbef0f7c15f449f47c1035b12e03ec8493d54d SHA512 07aa53185a7e8be5f04f69184d70d95bac4e3860da4fa302819e6f4ea0fc12de9549cc6c15c028a2a3911d1188e5ec1f0e76ee217c26b02b339b9453a1a9394c
 EBUILD vim-core-8.2.0508.ebuild 6932 BLAKE2B d48bf47e940afaf07e5bc895f8ebcca502743c7a7645769c1e6b03880b17dd7264bb0223f4303c26a1b0f91151e5fadc8b72787ab2b729efd04a216224463589 SHA512 e4c10050a8306994218defb29eabad1f0fddaf611636488894badd41c18788ff747bbd477626532fb8755f5a9ef663f2d1717c8f15ec2c0d5a88cf01f8ada153
+EBUILD vim-core-8.2.0638.ebuild 6932 BLAKE2B d48bf47e940afaf07e5bc895f8ebcca502743c7a7645769c1e6b03880b17dd7264bb0223f4303c26a1b0f91151e5fadc8b72787ab2b729efd04a216224463589 SHA512 e4c10050a8306994218defb29eabad1f0fddaf611636488894badd41c18788ff747bbd477626532fb8755f5a9ef663f2d1717c8f15ec2c0d5a88cf01f8ada153
 EBUILD vim-core-9999.ebuild 6913 BLAKE2B 042200cf91aa6df1f07f39b105ccffac69241d046ad850f51a839ada0274e3b394834df838e906ff1f177e5cc388ddba5882a52ea3de21cecab0235a6dc44c6b SHA512 64523a67f38cd56d2641b51483d70baa3d71cfe7aed1e284916d63d2305a2fe6ecfd399f5c55f8f3892fa73ed0f5e026286a5f58d4c70d62c2b6b92fbff3d7a8
-MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
+MISC metadata.xml 372 BLAKE2B 6a58d097c342a656a226d27d236fb952b31fb4c71a29333a60ec42db7b8bb1ae601e3c717d9c0fda939ff17eab70be2150a0dfeb26ca5b3d786c9b6050efde86 SHA512 63bca13db3d5830cb58e6a848eb444e72ceaf442bf41be1858d80805dc36cc9b9cd363f480feb8dfe1c7bf09cf4685a665657353867742d13f10fd133eba66f2
diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml
index ef998248ce9d..3979743b74bb 100644
--- a/app-editors/vim-core/metadata.xml
+++ b/app-editors/vim-core/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">vim/vim</remote-id>
+		<remote-id type="cpe">cpe:/a:vim:vim</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-editors/vim-core/vim-core-8.2.0638.ebuild b/app-editors/vim-core/vim-core-8.2.0638.ebuild
new file mode 100644
index 000000000000..28ba2d3038ab
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.0638.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index a3c33ecc4daf..309988b1a6ea 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,7 +3,9 @@ DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783a
 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
+DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 EBUILD vim-8.2.0360.ebuild 9047 BLAKE2B 61761262f606478b9bf0d3ed8a1e33d88675409b559b821285ac819222f8fb20cf4d1a473310b22a0f066e34d2794fb747f9abd66b83457e0ebe050e9ca0bfd4 SHA512 4de6099691f5bb9cb991b794bcfb257b835cf20d3dcb79e3715b9ffc92696a74094cddbd143734854420218e96bf9c482625c4c8d1cf0a55aafc07e128ce6fd0
 EBUILD vim-8.2.0508.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
+EBUILD vim-8.2.0638.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
 EBUILD vim-9999.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.2.0638.ebuild b/app-editors/vim/vim-8.2.0638.ebuild
new file mode 100644
index 000000000000..5bc04c0d2b05
--- /dev/null
+++ b/app-editors/vim/vim-8.2.0638.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+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/~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"
+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 python3interp)
+			$(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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-editors
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)