gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-editors
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
73 files changed, 2876 insertions, 387 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f0a288a89ace..900498fedeb4 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
index 3f8244701e68..4fefc8673b46 100644
--- a/app-editors/adie/Manifest
+++ b/app-editors/adie/Manifest
@@ -1,3 +1,3 @@
-DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
-EBUILD adie-1.7.54.ebuild 347 BLAKE2B 909982a7bb692feb5260227ad7970ec7e3ce22fedfd3fdb1b066fc737d95188031bcc1b72cc9616f08ca13360cc52d819427668947d4f0dd82366c890b570ef3 SHA512 5dd43892dfee84b23db51c8d7a62d6c01dc830afcda09e5a5d6017d08eb7d658065d0da46600673ed9cf7137d510e4f4f2fccfe398fc4fd9840420940d7a811b
+DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
+EBUILD adie-1.7.67.ebuild 352 BLAKE2B 1eea30ede78eaaf047ba50591b14086fd9c9fdd45baafea58b5c7c18dd0d56d90861ef9134dd060756d6add2b043236e74dca06122c1c0f980246109bbbee795 SHA512 aa406e5be5e23e01674736f6278cbc681e60d19f9af5b257155736b0f6a731fd74a5e1a897b227a1a68d966249b1b954ce38e5fc0cb9cd7cddf1bf12cd500955
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-editors/adie/adie-1.7.54.ebuild b/app-editors/adie/adie-1.7.67.ebuild
index 881aab887552..0e290d6b8df5 100644
--- a/app-editors/adie/adie-1.7.54.ebuild
+++ b/app-editors/adie/adie-1.7.67.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Text editor based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="~x11-libs/fox-${PV}
diff --git a/app-editors/beaver/Manifest b/app-editors/beaver/Manifest
index 99ffb6b3c972..4433e4cf676e 100644
--- a/app-editors/beaver/Manifest
+++ b/app-editors/beaver/Manifest
@@ -1,4 +1,4 @@
-AUX beaver-0.4.1-desktop-file-validate.patch 541 BLAKE2B 3847326cc887bee9f3bff580fb15de09375a44180941551b67b8a8be66396c32c6e671b7bea724cd9c318a6fd6fb5851944422b64f6229e663501e1da331fb1d SHA512 17a1f673f3b7b9e283cb1d8ea33b387cf78f1a2623f2a8ae114960504db6c90afec980035ec5627584f144ec516f65b1c2a52880f0ad6114dbabff02031ba6d5
+AUX beaver-0.4.1-desktop-file-validate.patch 545 BLAKE2B 33bb8b9c5b90d2257b7e083b832f0a9cfc82b512b51da8e1cc56eee657793c4ed248f97606e6cb4679d398e35d3b5bcea6be9a83230061a5cc7f877c44772769 SHA512 ec33d4a2132bd03859426e7bbaa7a178d808ccd949387a85d18bc0fb01cb907cdb61ce28f52405f71f1b397b6221fa20c00f415e4979db51256511621ffb8475
 DIST beaver-0.4.1.tar.bz2 436321 BLAKE2B 034829d795b5a0502a2df1e675e01d34cc62efbc482959e2d3e0ecf9eeddf1d8450e92ee9c2f98af3e2778ad4c14fac926291ca935ec79822f8f552a9579363e SHA512 3000bed3aa2a67d6c38a68a7782a9d5423bcec0b8420272b0f0dade604c094a7b52058b43222af38d56313f0aa27998028c984f69340bf28eeaa8b8a93548a1e
-EBUILD beaver-0.4.1.ebuild 967 BLAKE2B 8dbe5be9037a81db5bfe3c7c26b616d76051f3a08343822549d86a64e4afe2f058c8a55d82d87971e40c0d5b84e15e0848ca0fe6bfcf12ca673617e598407acf SHA512 aacb9b7d54da3d774b0c1b98ae4ca9695d25e3d1e2d2e1d71253f91a1cafc41b4c0c3a09d199d67b6154dbf3deb1071339ad52071b8679bbaee633cb1eb54bda
+EBUILD beaver-0.4.1-r1.ebuild 981 BLAKE2B 95ca31b255da1262a9e5aae4291afed1e65ce1e11ae68059ad7dd892c33216e323867bb3ce6343326ae1ce6ea6b7964e1e291e4be081bcd9f8e4628bb83c228f SHA512 72ad9c5278f7a339bebfb7a3d76526b59328ff5aa06f8151474d1aaaa834d995988c19c7fffb3a4d05c34ac081378611d329dc07fe05c600b72e7a99d595b992
 MISC metadata.xml 359 BLAKE2B d0b8402f3a7a6f77f7c79733394a2bf595320b8f51a65432fd545975b72e9d94ecd5845b8f9f446b3519f6ee2d44c111dadfe6d86cd78bee0f1ba4c3bd7da31c SHA512 7fec5e4168c877d16d8d744244e0aa3cfef4d6d219dc3485caeb21802de8aab2a00188572393b885ef7f8f7ed72b3bad3f5622ecf057347ce6969fb1d3fc5759
diff --git a/app-editors/beaver/beaver-0.4.1.ebuild b/app-editors/beaver/beaver-0.4.1-r1.ebuild
index 6e8052b4e9b9..57efb98a47a3 100644
--- a/app-editors/beaver/beaver-0.4.1.ebuild
+++ b/app-editors/beaver/beaver-0.4.1-r1.ebuild
@@ -1,53 +1,54 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils
+EAPI=7
+inherit flag-o-matic xdg-utils
 
 DESCRIPTION="Beaver is an Early AdVanced EditoR"
-HOMEPAGE="http://beaver-editor.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/beaver-editor/"
 SRC_URI="mirror://sourceforge/beaver-editor/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.10:2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
+IUSE="doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	>=x11-libs/gtk+-2.10:2
+"
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.1-desktop-file-validate.patch
-}
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.1-desktop-file-validate.patch
+)
 
 src_configure() {
 	append-cflags -fgnu89-inline
 
 	econf \
 		$(use_enable doc doxygen-doc) \
-		$(use_enable debug)
+		--disable-debug
 }
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_install() {
 	default
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch b/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
index b820826e14d6..f786565ced04 100644
--- a/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
+++ b/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
@@ -1,5 +1,5 @@
---- data/beaver.desktop
-+++ data/beaver.desktop
+--- a/data/beaver.desktop
++++ b/data/beaver.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 34c5eddf1123..801888b2f198 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,2 @@
-DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
-EBUILD emacs-vcs-26.3.9999.ebuild 12759 BLAKE2B 8900ee0302207baa023c190bc8da12eb376c23f883b8c9652350c710bca95b77b267acca81cb45e2b10924f0aeb765bc6b0c905718cf0c5738687664bb82805b SHA512 527a174080c974f435aea4ebb5a62924eca2762ba7dc638e5cdbcc4a7d62cce5644438294fbcb9ef93cbda75a3a568c7622ae1809809cbc2814b15973e83b459
-EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 12598 BLAKE2B 2259d0d004d65284ec6df5877ba06435d57765983cd8e69dd83d1a87d1c977a195bf19bd18198b9eef98c59654f40d72f4426ee84ece645ffc1628ef13c033db SHA512 31e4042593120fcd3c2e62a640c6400b90e24732360ae8450dd6e59f67c15c856ad1758b378f64a5d4c981a023acfa9a989e5984c0fc291a595e0ef5ceb0dbf8
 EBUILD emacs-vcs-27.0.9999.ebuild 13000 BLAKE2B 6277fe9888ca1bfdcc54de780b31528edfb29348addd830d5854a676054cdd60b0c64f5024c872b429ad81c96e9b7a98015f87a0cb09aa5c3c97a27b29bcd23c SHA512 ecc60f132e047eb84454dfa6cf63f0fffbefd73cce2039bf74841d84e3d658508ad283a21a0b48377b9cd300cb59091d5c823c24171a23f3f9b9768da311f37e
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 555a45701ad5..3e1e31923eff 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,10 +9,14 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
+DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
 EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
-EBUILD emacs-23.4-r18.ebuild 11020 BLAKE2B 78ad1ec86d078214614dee296898c098727ff0d0cfc352e1b9d1467acb6d138a95786a791e6caa91ee0b8724cb47a61871397401f47bbce5aa4ae46c8f1d3da8 SHA512 fe4100e72b826ed98786f9f587ed3c487f4cfd7b1a4a2c0dd8ba3601e0bb67eabcf81d8e547649c8a39fab48d009859e9d5803e3749bd0faa87d5a4651120d63
-EBUILD emacs-24.5-r7.ebuild 10830 BLAKE2B aa5b825b68a159b24dbb912063d96e3db7165949fa67c10c90e79b50f26e8611e522b6b8803d64555d7e22b8fe2e3d9dff930ef357935968ee3db2cfc2477355 SHA512 72b6570e9987a13c4fee65fc3678e6eda935c1da841593582d174b58340c842fe2fd10132f297f9bc25bf9ddc44dfe78a15981da3315a295233add39daa09b4f
-EBUILD emacs-25.3-r6.ebuild 11181 BLAKE2B bcdd349acf66bcfc07ad14e7a95ead3709f1cc065c74375b28c74c50dcf8ad376e30187147e6633f4c88e845c7a8e034aba924aeec3fdb92d2ef3be339b29553 SHA512 285b02198b107d1507bf01ee25d1f2d4aef59b5f24d22b23bfa7af38de115c1b35a51cf0a24d6e4b4c36f7d0c0a804e2c519cfea36f8aa805c15645014474dcd
-EBUILD emacs-26.2.ebuild 11685 BLAKE2B 8eaa6ec4aedbdfbeb72c69cce2c5c945ee2a30099925d6027a29c58d13ef9bbec6156107dc31572aa33f19bfec70e862cc7adbb1ae9771744a509aeff5323422 SHA512 d74de92d5c08005f41d4bfdae38ee1c0215d76b7280ed6b883bc14918db92c65fedbcd8c50c3d05efee12b99f8f6a45c7e2ab01134d15fe4a5756269b551b0d4
-EBUILD emacs-26.3-r1.ebuild 11970 BLAKE2B 6ef7dbcc1acec0fb8deb4e2f50bb31f1cc56e801046b41ebcaa5add5140b016a934176eb72f2edc83f1b94294c4ab8f49b8f2ae1b09343be0447a6884df5e911 SHA512 2579a96471f828b21ee2db17dfa6a896afc8f98bd381ff07604056c091bad28c94471952b3bb851c233c6f118fb4afbbbe3ae0928670c406d8fe1f6a1ed35695
-MISC metadata.xml 2741 BLAKE2B 9f945f7d777f555676d0c51648822627a3320b98832d9a8dfb93574a2361a3c439f54c8a94f033bd6ea936625764190b5863e727bf518aafd99da389337932be SHA512 6b81f609c0834d10cbdd807e7bf60fa95e23531795bcb6b4a0f854299e3a7498a412fa2864a40b285701c4151ee8473cda9d4b8295b1d60f4b29b66dcb55e11d
+EBUILD emacs-23.4-r18.ebuild 10982 BLAKE2B 7a4f902b59fb956e75716926c3202ab34a5fc26527f9e2557192830c0fbc33684ace7940d508443f5fba9933a25b5837a16ec20c7170cd3dccf2faf743c15488 SHA512 59b7e5369c6de4056e361066b23e2d26d256e6426d14fe97d60731fbdd9dd05f55f1de5d262a3111d1ecc9e1e862d45440e4729056f5b93f13a9750364d7ae9f
+EBUILD emacs-24.5-r7.ebuild 10792 BLAKE2B 3625210c0d2ed6fb758f93473bf938026c1d8303348ceed1a71c8727567ef7b94cd1e422a8ba922901453b4a7a0dd0fd5a944130b406f0762088dc7077253728 SHA512 ace3817542036aa0dbf1ee187649062369a205a5d42d5e2b56c7bd3f39bc267fb0f155d56137bcd52929be585f2cdccf0b1563ed736959deaf64ed370d47a751
+EBUILD emacs-25.3-r6.ebuild 11143 BLAKE2B 716342f762363507d9e5320b8169296f7f7137591b08cb1a1e2769222892f5d5ef7c0fc5a48d453fbf9fcec24bce632f75c2fb1be244fb7b10025ced7b3d8417 SHA512 2cdef6bb8a44080903b7208ce43ca403880f14c2c6aa9c542a6746758c8bdf2d9c3147ff2a670c401d4c2c23b89843032bae2ad4cf6031880587505d2afc449b
+EBUILD emacs-26.2.ebuild 11647 BLAKE2B 8d2d7ab25bfac8075d5e6fff70df9bce0314fca8194fe88e986a68de10451f0129a416a33c84adde2c99f6bb32bb88900298a86e4ce760ab4524b8049eb8b2c7 SHA512 d69edad0066d6c7db51a1f81a7643404282a832c28ec175e9704d1cfbaddff55598ef22536c702e0c2cdfc10e1c8ec9ca840f6ac33f5c4b4fbee426bd0ff4280
+EBUILD emacs-26.3-r1.ebuild 11932 BLAKE2B 1dc6f4b91a30a54b3898d29b5387aaf7bed43616f7c0139ad7d909c411dd22d4d0851dc46a346873dc869730765941f3630a022197a6af6e6c43401ef0cdb9a1 SHA512 4a77fe9f33e113bd0544ec46a0872efc87528f705f48eb392657278559289bd3c34b145933959e4fa1692b915e88fc20a421b4b1063e13a4d127d863c26043cd
+EBUILD emacs-27.0.50_pre20191223.ebuild 12944 BLAKE2B a91aa673242357b6906b6e33daac9cfdf52633eb9e5af2c574e8e084cdeacb82eeebacd460c5087573412b87be701a110d44030a4014939a2a1fb40966ca841b SHA512 f5594a35b2fdcdc498bfe087be6bcf97549a989e66224a355400017279e56b2086314a6ee73ca9815ec5ebe29da74daf41210dfdfe2a8c1651c51c9e695e4740
+EBUILD emacs-27.0.9999-r1.ebuild 12946 BLAKE2B 8eb50306106f7e86e3de771a8e12f777d016f12a470fea4ed350f0dde137505470ace0daae5fa2991fa2bc7c9fbb0824de58f778a8c46dfa7b8fa3393f5e5a9c SHA512 3f1923925785f637fcfe2257592a368d97d76fa6f9e4a24d1e077432b9f4cebf42081c611eeef0bcc4daaed317de7cd4aad669f0158880957ccd8721b6569251
+EBUILD emacs-28.0.9999.ebuild 12895 BLAKE2B 9cefc9a76c7361d3719c22b18fd781f22e39ee389b1312c18fa14118061d1e187cb9f08fc14cbb542727b1c4a5b983fa47b7c687605d05819bb8e2616cc13466 SHA512 689be5d0fa91f9ee6916201a3dbbeb6fc46189946597d6ebdee6830332a24027e9ff7fd20d022f2e73b51131d540ca6dd813f09cd0bd3385b5ea49d402d1bc6b
+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 9a48a465e91e..98c12e08da18 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -82,8 +82,8 @@ BDEPEND="alsa? ( virtual/pkgconfig )
 	X? ( virtual/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
 # order to determine some path information correctly for copy/move
 # operations later on
@@ -277,7 +277,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -299,9 +299,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -317,7 +317,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index dcd5917087bf..afb4238b747b 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -90,8 +90,8 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
 # order to determine some path information correctly for copy/move
 # operations later on
@@ -272,7 +272,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -294,9 +294,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -311,7 +311,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 726d3e818c2d..8f79717eeb5a 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -96,8 +96,8 @@ BDEPEND="virtual/pkgconfig
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
 
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
 # order to determine some path information correctly for copy/move
 # operations later on
@@ -283,7 +283,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -305,9 +305,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -322,7 +322,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 960bddd23123..488c95652d9d 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -104,8 +104,8 @@ BDEPEND="virtual/pkgconfig
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
 
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
 # order to determine some path information correctly for copy/move
 # operations later on
@@ -300,7 +300,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -322,9 +322,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -339,7 +339,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index a9f8c3660f2c..7ec3305f06fb 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -104,8 +104,8 @@ BDEPEND="virtual/pkgconfig
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
 
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # FULL_VERSION keeps the full version number, which is needed in
 # order to determine some path information correctly for copy/move
 # operations later on
@@ -309,7 +309,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -331,9 +331,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -348,7 +348,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
index 3ca4a8cc86ad..4bf595df19f0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
+++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,9 +12,9 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -27,8 +27,8 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el 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"
+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"
 
@@ -77,6 +77,7 @@ RDEPEND="sys-libs/ncurses:0=
 			x11-libs/libXft
 			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
@@ -117,16 +118,15 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-if [[ ${PV##*.} = 9999 ]]; then
-	BDEPEND="${BDEPEND}
-	sys-apps/texinfo"
-fi
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27"
 
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -143,8 +143,7 @@ src_prepare() {
 	eapply_user
 
 	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
 	AT_M4DIR=m4 eautoreconf
 }
@@ -187,6 +186,7 @@ src_configure() {
 		if use xft; then
 			myconf+=" --with-xft"
 			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
 			myconf+=" $(use_with m17n-lib libotf)"
 			myconf+=" $(use_with m17n-lib m17n-flt)"
 		else
@@ -252,12 +252,14 @@ src_configure() {
 
 	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) \
@@ -279,22 +281,20 @@ src_configure() {
 		${myconf}
 }
 
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
+#src_compile() {
+#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+#}
 
 src_install () {
 	emake DESTDIR="${D}" NO_BIN_LINK=t install
 
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
+	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 "moving info dir failed"
+	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
 
@@ -310,6 +310,15 @@ src_install () {
 	# remove COPYING file (except for etc/COPYING used by describe-copying)
 	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
 
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
 	if use gzip-el; then
 		# compress .el files when a corresponding .elc exists
 		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
@@ -330,7 +339,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -352,9 +361,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -369,7 +378,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
new file mode 100644
index 000000000000..888936ba8cec
--- /dev/null
+++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
@@ -0,0 +1,413 @@
+# 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 multilib 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 ~sh ~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="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	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="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27"
+
+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 sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif 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
+
+	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-vcs/emacs-vcs-26.3.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index cbdccc89439d..c8fd88b4d30f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,13 +8,13 @@ inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-26"
+	EGIT_BRANCH="master"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -27,9 +27,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+SLOT="28-vcs"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
@@ -38,8 +39,10 @@ RDEPEND="sys-libs/ncurses:0=
 	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 )
@@ -74,6 +77,7 @@ RDEPEND="sys-libs/ncurses:0=
 			x11-libs/libXft
 			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
@@ -114,16 +118,12 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-if [[ ${PV##*.} = 9999 ]]; then
-	BDEPEND="${BDEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -183,6 +183,7 @@ src_configure() {
 		if use xft; then
 			myconf+=" --with-xft"
 			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
 			myconf+=" $(use_with m17n-lib libotf)"
 			myconf+=" $(use_with m17n-lib m17n-flt)"
 		else
@@ -255,12 +256,15 @@ src_configure() {
 		--without-compress-install \
 		--without-hesiod \
 		--without-pop \
+		--with-dumping=pdumper \
 		--with-file-notification=$(usev inotify || usev gfile || echo no) \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with dynamic-loading modules) \
 		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
 		$(use_with gpm) \
+		$(use_with json) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
@@ -274,10 +278,10 @@ src_configure() {
 		${myconf}
 }
 
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
+#src_compile() {
+#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+#}
 
 src_install () {
 	emake DESTDIR="${D}" NO_BIN_LINK=t install
@@ -332,7 +336,7 @@ src_install () {
 
 	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
-	;;; ${PN}-${SLOT} site-lisp configuration
+	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
 	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 	Y  (setq find-function-C-source-directory
@@ -354,9 +358,9 @@ src_install () {
 
 	if use aqua; then
 		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
 	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -371,7 +375,7 @@ src_install () {
 		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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+	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
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 7af9ff05554c..0ae048b21bd4 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -34,14 +34,19 @@
   <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3
     (<pkg>x11-libs/gtk+</pkg>)</flag>
   <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+  <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping
+    engine</flag>
   <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
+  <flag name="json">Compile with native JSON support using
+    <pkg>dev-libs/jansson</pkg></flag>
   <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
   <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
     instead of the internal movemail substitute</flag>
   <flag name="source">Install C source files and make them available for
     find-function</flag>
+  <flag name="threads">Add elisp threading support</flag>
   <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
   <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index fb7275498c43..b6491f42048f 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,4 @@
-DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94
 DIST gedit-plugins-3.32.2.tar.xz 1474264 BLAKE2B feb116ec201b9eb9630570818cc288f0044ecfc174fc84c7d812aa6dfba5cc3748b4e2351ffa2be0d3a593a58b2318c4296b54b84476fc887195ee27f27bb597 SHA512 2767bc766daba5e1c81ef5a00bc3589a301c02e0286a6622cf11a03b5b391ecbcf9456187563dad4f2916610ee9ddca4414ff4beb639820954385ee3f8091d2a
-EBUILD gedit-plugins-3.30.1.ebuild 2341 BLAKE2B c582963908681011ddfda5a61d7c2e3ef0747f150ac7724c3d1ef300429d17ea426ad8d72729ecf2c8dda2e660e4ba8260dc27488b921dbce13d96866d881684 SHA512 44b51f949bb6e6e6b0341c65c9637093db96326c443312ca697cd21426db7f99ea40cd6aec59256793426dc5970e4981781b1d7c0e016dd885f9c9a62e16b046
-EBUILD gedit-plugins-3.32.2.ebuild 2316 BLAKE2B 86c93402cc77be92638ee97cf7e41b428c05d7a468b890990200d7bc9fcefb180ddfef8f57d7423d298b38a63804799c092a96b387720c6d17ae5dea98947516 SHA512 952b52a149d73ae31693682cbd0debef8223295054b692c3f6c24a3f754436292cc466c125a22d041974f3d44c860aa0247ae8d83cbe5cb99297c94d47e823ac
+EBUILD gedit-plugins-3.32.2-r1.ebuild 2383 BLAKE2B dfa536d051b59b6de2a9c72ec90dc67b11c53de38df9992db4dfe640050db6913f2f5d027dd5a2b0989cdff14d4a5e2a7c54fae2a326bab55951a56fc6526f81 SHA512 b34a616b814baa236e037070b6c4808269febb644f18c02ad02ad1b0773f858b906c20b4f1e1408d45be5272e62600de93414e27c7118f818dccb38ac5279248
+EBUILD gedit-plugins-3.32.2.ebuild 2314 BLAKE2B fffd3532b8f714efda95340b4ea0bdbe7ff3bab8e9ffaadc2ed07652cb1a1b3d5cf14de32c8a737b278e4ee04853e1b0ec0da60b944aa4abdee23f171493611c SHA512 c8dbe0866d79a153a9ccf89fdc33cc09e16ee19fef18dfd219f4b41a1d2bd2b2a7ea727af6053ba3b611029a2c832d3bdad270edd8d4d430d72b1d9c0876c1a6
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
index 21af002545cc..ba7394761d39 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 
@@ -13,7 +13,7 @@ DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 IUSE_plugins="charmap git terminal vala"
@@ -31,16 +31,18 @@ RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libpeas-1.7.0[gtk]
 	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-3.21.3:3.0
+	>=x11-libs/gtksourceview-4.0.2:4
 	python? (
 		${PYTHON_DEPS}
-		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=app-editors/gedit-3.16[introspection,python,${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
+			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		')
 		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-3.14:3.0[introspection]
+		>=x11-libs/gtksourceview-4.0.2:4[introspection]
 		x11-libs/pango[introspection]
 		x11-libs/gdk-pixbuf:2[introspection]
 	)
@@ -50,9 +52,8 @@ RDEPEND="
 	vala? ( $(vala_depend) )
 " # vte-0.52+ for feed_child API compatibility
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.2
 	dev-util/itstool
-	>=sys-devel/gettext-0.17
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
index 44dcff543bc0..2c8ba88d1e57 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 8ed2d144e9dd..2b72cd735046 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,5 @@
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
-EBUILD gedit-3.32.2-r1.ebuild 2265 BLAKE2B 93b036f65dd0eb5e3732108663d6499a5716412cd57dec9826079d11ae21b867c2e0470df0f374356dd900bb9f93611531e25485e83fbbbf2ac27f02ac3a3382 SHA512 b76d12c7d850f5476d0aaf72fc6939f6d7592ce9aa40b9711e8499518a4a44f120183f444af6ebf9c2b20d185c461e638c096075a38a9560e04e5c885394a2b6
-EBUILD gedit-3.32.2.ebuild 2150 BLAKE2B 61ef803a4e5a06d76655beb99e71915f076ce7bb8e362b733a814c9b2629c989349e9d54373ad5aa3d89520d9d043fbfde33453d3f48b6954a0cd7528e38ed12 SHA512 83fbbc5e2dfc3c718c42298c8a36bc54c598439230198a0638d905b347dc87d9d3cba1ebd00313532d92cbb9009b317c9938466b086ebe9096713a5b28008200
+EBUILD gedit-3.32.2-r1.ebuild 2263 BLAKE2B de5b1d3ff6dbbf5fc1a875ae51f56428ca19cff45508ed0bb79e632ca89c5dc9a4d5829e32407b8032b1f27605c8b4c91e22d78be052a7eb7b7652d87d636cfa SHA512 1a5ce93aeb577f9717a1562df9e73a58849378b76640669b470b54fedbddc2273010715b8430b13e1813d0ff481aa13dcf1aa50c14c0894b3f5883bd3c7d61ab
+EBUILD gedit-3.32.2.ebuild 2148 BLAKE2B 2dd7960f9a773a67089b156d46e2b1f1a1a8f1dba9ec8614bc20755fd1111d4a15e1883cf8cb6cc552cb3dcacb62720f7798bd644f3ade5dd8154560b875df10 SHA512 d3bc48ebbee1b08dd8e8d91a67a026a3b431c692f1a0622734e64e7769e95780528e466c19ad2f7a44c43a1bf2eb6fcd5e03c5b25138a9b2d96cf253b9525843
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
index 5338f0399096..8fc28471641e 100644
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ b/app-editors/gedit/gedit-3.32.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-editors/gedit/gedit-3.32.2.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild
index 93415e5e501a..f312441381b1 100644
--- a/app-editors/gedit/gedit-3.32.2.ebuild
+++ b/app-editors/gedit/gedit-3.32.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 7a41c29bfa80..916cad4f9264 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,5 +1,5 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-DIST gummi-0.8.0-rc2.tar.gz 581744 BLAKE2B c0665c8c2f8d6c0b4472ce4b9510362b942b7197ce205be763afe6272c848d4195a31b1cab0515d2d68ed517b153d943d52909744d9c91097d6fbc2a9a2b8793 SHA512 cc50a1d331dd93cca50aa50d2ceeeaa37740631b3cacbfc22d6b0a706bf8d9b00fb0935d1c712534108a3d7b32420e6bebf3f5592cd36a92b290f49b355d22fb
+DIST gummi-0.8.0.tar.gz 580933 BLAKE2B f0591d1acf244edb4cd2a6db109532b84dd0ec741e4575c1bdc690e0763a73ebe8e8882c328627908d9cc0c23ba50e94d1d0e5cea95e60a22d0a369cd4a1f8c1 SHA512 a4ae897a9f3f6f1dabb70a09801e83e0675934298caa022ddeb2c84f90d418cbc5b1a0e02b4b021f40daa784f145b5136b53ce70acf3e4834eea04afcb663b2b
 EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
-EBUILD gummi-0.8.0_rc2.ebuild 1018 BLAKE2B a8e9750a0a9b9eb6abc925dcdb149c23798678c7f66b64c599bd9e6f9cbc8d36b40566b3b4d40b3f86c19daf3847627d621a7a33ec6679523e1457412f759e59 SHA512 978affb6525db5b0c28ce2c8a1d6199d6cba526a83ff8fea3e0072d5b7e90d60841490568716b2f8e7bead940ff53564f2268afcb272a2d3f2f8c362d4eb05b8
+EBUILD gummi-0.8.0.ebuild 943 BLAKE2B 0c5e299fdccbf498337ab8d8498d6f0af2e91ef7a52e3a9988354b61f030b77d22d9eba4e214f8d2d3f6a01437e2c666abb0f851e36ef742927c7e9fc450be55 SHA512 bd3decbb0dd7e430ce5890099cb620472bf39f52a1f3248fcdada2a0c7dcfb19f8ac9bdb0979e6261abcb6345b898866b7177125e88d6f886590d472cb13017c
 MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.8.0_rc2.ebuild b/app-editors/gummi/gummi-0.8.0.ebuild
index 480181fd2a3b..1b970f9dfd15 100644
--- a/app-editors/gummi/gummi-0.8.0_rc2.ebuild
+++ b/app-editors/gummi/gummi-0.8.0.ebuild
@@ -5,12 +5,9 @@ EAPI=7
 
 inherit xdg-utils
 
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="Simple LaTeX editor for GTK+ users"
 HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -36,8 +33,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_postinst() {
 	xdg_desktop_database_update
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index e831ad8ba9f7..96dfc867e22c 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -3,7 +3,11 @@ AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-EBUILD gvim-8.1.1486.ebuild 10484 BLAKE2B 705dc36a68203d67960bafd223e3470dbcf110ae2adb703a66a036471398062e8f67321dbab9be7a2ab7f55fad981b879374750540833d07572a0108687bded8 SHA512 0b5a4ec94b3be6c7617666ba76d205e6b049a242a449ae6276ed0e6b4fad7ac468a84016e3b7b9da851f32a20c113b219a490dab8e7c79da9b392c60192bfb69
-EBUILD gvim-8.1.1846.ebuild 10560 BLAKE2B f978c64faf723120390ff56bb17fcc91a3c4e325bd5bc592adfd68cfb8fc9421937de21d3343739364742289ade6ec77b0bd8ffd701995964b82de0f07a45025 SHA512 b400dd6a94ba7bde34c064d0444ec3d3d98d04aa14398e7e94a0b80142858155d28296fbbbcc12c3f8bbb3e7cdca5727c187cd1d6d24ee6db307677e4d332331
-EBUILD gvim-9999.ebuild 10469 BLAKE2B 71861c44a0a6013c1effbb221b499c8e6805b3263fe6064c2139ebc4970894250696d72faf72a4f5fcfd84ae41ad4d1ad7c4331898a30e41176bdbe4c7d99734 SHA512 d4948fb7f77706838f6d15ff8d7d25020dafd95e36899638199020ac363618b71a6614df9e27312a6d70e75d8dd0a70f356a37f6f5942b59821b32178c1db440
+DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
+DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
+EBUILD gvim-8.1.1486.ebuild 10480 BLAKE2B 007b09cc3a0e77ac67dbe365e97df30a3c1741947f4b221a342b9e1166dcde9fc5f4e63c88a9953180bbfe3fe22759d6ca80fbff4d662c95bda3086790fff8af SHA512 8109c52b6d01e9620530d4b7f2a4a2be7ddeb3b512bdb4ebab48ff902f31e8b9850e99ff62b5505248de438264bdc57790b8711c9c9d01c63c52cc1ed812bea7
+EBUILD gvim-8.1.1846.ebuild 10556 BLAKE2B 7df798e79326c4bbf64be95fcae2f3ac4668dedc949211010cc6f82c69d2e85f6ae96089c063947bf424a33e2956bcbdaf044a43bbaa8375e5f5540c1daeb434 SHA512 acb4e88bd8fa52f8fc69eb038030f3d148ec916cbcdd812411b8bb58ed7a2801bdc32a04b7af057d925113c6353aade536cc1a5a8da138a1ffd0e54227bb4837
+EBUILD gvim-8.2.0055.ebuild 10556 BLAKE2B 66fd819bf91a53ef4535df4a63c0cc85b65c33d5d5db66219d5e895bddb5c7f2eea1fb2450456d549cfac2143d82fcd5bf1c2150cc39f4b91f60416fa367f2f4 SHA512 7e7693d91affa860adb941c25dad8583abbb5720d7fb2aa44919e9850cac8ef6b711dd138fb1799029f7f918164f4ebb175e4a9d461a5adcb234121f069dd62a
+EBUILD gvim-8.2.0114.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
+EBUILD gvim-9999.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.1.1486.ebuild b/app-editors/gvim/gvim-8.1.1486.ebuild
index 3db19e3bb9bc..a6611c41126a 100644
--- a/app-editors/gvim/gvim-8.1.1486.ebuild
+++ b/app-editors/gvim/gvim-8.1.1486.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26"
 
diff --git a/app-editors/gvim/gvim-8.1.1846.ebuild b/app-editors/gvim/gvim-8.1.1846.ebuild
index 29b3e72b4e23..270617a27f6d 100644
--- a/app-editors/gvim/gvim-8.1.1846.ebuild
+++ b/app-editors/gvim/gvim-8.1.1846.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26"
 
diff --git a/app-editors/gvim/gvim-8.2.0055.ebuild b/app-editors/gvim/gvim-8.2.0055.ebuild
new file mode 100644
index 000000000000..b03fab986ea8
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.0055.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
+PDEPEND="~app-editors/vim-core-${PV}"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_with python python-command $(type -P $(eselect python show --python2)))
+		$(use_with python python3-command $(type -P $(eselect python show --python3)))
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                         CARBON (not tested)
+	# -aqua gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-8.2.0114.ebuild b/app-editors/gvim/gvim-8.2.0114.ebuild
new file mode 100644
index 000000000000..2bdfc5eb2348
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.0114.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=( python{3_6,3_7,3_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/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-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/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index a26105139406..2bdfc5eb2348 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -199,9 +199,7 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
 		$(use_enable python python3interp)
-		$(use_with python python-command $(type -P $(eselect python show --python2)))
 		$(use_with python python3-command $(type -P $(eselect python show --python3)))
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
@@ -341,29 +339,29 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
+	# update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Update fdo mime stuff, bug #78394
+	# update fdo mime stuff, bug #78394
 	xdg_desktop_database_update
 
-	# Update icon cache
-	gnome2_icon_cache_update
+	# update icon cache
+	xdg_icon_cache_update
 
-	# Call eselect vi update
+	# call eselect vi update
 	eselect_vi_update
 }
 
 pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
+	# update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Update fdo mime stuff, bug #78394
+	# update fdo mime stuff, bug #78394
 	xdg_desktop_database_update
 
-	# Update icon cache
-	gnome2_icon_cache_update
+	# update icon cache
+	xdg_icon_cache_update
 
-	# Call eselect vi update
+	# call eselect vi update
 	eselect_vi_update
 }
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 54d609664106..4f29ace5a09f 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,6 +1,7 @@
 AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e
+AUX juffed-0.10_p20160323-qscintilla-2.10.3.patch 2030 BLAKE2B 1946d32e43bb091b96f844955d65dfc956fccd6aabe1238d65cf962382312bb3246966d2ee8701da66e41922c3669e70e76bb8ca7cf9f745c1f066ecfa4e4071 SHA512 2a5a39674b38ab44db1f7eee7e1488b2004b050dc42db2e954442612ff63505c2b4abb831d0e1b711e4dcaacb1bc7943fe05112f6fc8bcf2ce52a0caf4e1d3b1
 AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3
 AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952
 DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
-EBUILD juffed-0.10_p20160323-r1.ebuild 1386 BLAKE2B e88936ebe034967e5a6b1eb3b2b1855c1cf1bfad3160e21c6498773a774d9f1fc89db8743ae1686400657f95cfe97c024f41b9d89c53b10c6a3b1489ec0cc5a3 SHA512 60d4c2a48a2c91c3ec1e57245d02da45f0dd021538c82809c9608d5e5916d0f86160f1dc644007b0e7ed4c4c933fc45b00e02826063ed3aa3fceda6787f632b6
+EBUILD juffed-0.10_p20160323-r1.ebuild 1273 BLAKE2B 188811be9a80b210ed9d24e4eeca1dc327dc148a90a2cf8ada892be8331f20686754cd8f7457fec5200181570c8602b03c7cf7dc9362648ab038118a37fdcf7c SHA512 eb278d169660b5c3f76fe6c6bfcf1c8de24b0ea53b4e6f40a536500c92cc8d3e77c13388501ada64be7b51364835ff55ce0d5ae7ee768ecc3928d9a5d2dcde2f
 MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
new file mode 100644
index 000000000000..f4a22957480d
--- /dev/null
+++ b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
@@ -0,0 +1,71 @@
+From 49b6982336ad127b2b780d2ae7c1be1104d9dae5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 10 Apr 2018 20:31:38 +0200
+Subject: [PATCH] Fix build with QScintilla-2.10.3
+
+---
+ src/app/qsci/lexers/qscilexerada.h     | 3 ---
+ src/app/qsci/lexers/qscilexerhaskell.h | 3 ---
+ src/app/qsci/lexers/qscilexerlisp.h    | 3 ---
+ src/app/qsci/lexers/qscilexernsis.h    | 3 ---
+ 4 files changed, 12 deletions(-)
+
+diff --git a/src/app/qsci/lexers/qscilexerada.h b/src/app/qsci/lexers/qscilexerada.h
+index 984f97e..30c6646 100644
+--- a/src/app/qsci/lexers/qscilexerada.h
++++ b/src/app/qsci/lexers/qscilexerada.h
+@@ -3,9 +3,6 @@
+ 
+ #include <Qsci/qscilexer.h>
+ 
+-// located in SciLexer.h
+-#define SCLEX_ADA 20
+-
+ #define SCE_ADA_DEFAULT 0
+ #define SCE_ADA_WORD 1
+ #define SCE_ADA_IDENTIFIER 2
+diff --git a/src/app/qsci/lexers/qscilexerhaskell.h b/src/app/qsci/lexers/qscilexerhaskell.h
+index 78c8978..56a3614 100644
+--- a/src/app/qsci/lexers/qscilexerhaskell.h
++++ b/src/app/qsci/lexers/qscilexerhaskell.h
+@@ -3,9 +3,6 @@
+ 
+ #include <Qsci/qscilexer.h>
+ 
+-// located in SciLexer.h
+-#define SCLEX_HASKELL 68
+-
+ #define SCE_HA_DEFAULT 0
+ #define SCE_HA_IDENTIFIER 1
+ #define SCE_HA_KEYWORD 2
+diff --git a/src/app/qsci/lexers/qscilexerlisp.h b/src/app/qsci/lexers/qscilexerlisp.h
+index 5b43d74..6e5dc32 100644
+--- a/src/app/qsci/lexers/qscilexerlisp.h
++++ b/src/app/qsci/lexers/qscilexerlisp.h
+@@ -3,9 +3,6 @@
+ 
+ #include <Qsci/qscilexer.h>
+ 
+-// located in SciLexer.h
+-#define SCLEX_LISP 21
+-
+ #define SCE_LISP_DEFAULT 0
+ #define SCE_LISP_COMMENT 1
+ #define SCE_LISP_NUMBER 2
+diff --git a/src/app/qsci/lexers/qscilexernsis.h b/src/app/qsci/lexers/qscilexernsis.h
+index 8b009ec..06efc40 100644
+--- a/src/app/qsci/lexers/qscilexernsis.h
++++ b/src/app/qsci/lexers/qscilexernsis.h
+@@ -3,9 +3,6 @@
+ 
+ #include <Qsci/qscilexer.h>
+ 
+-// located in SciLexer.h
+-#define SCLEX_NSIS 43
+-
+ #define SCE_NSIS_DEFAULT 0
+ #define SCE_NSIS_COMMENT 1
+ #define SCE_NSIS_STRINGDQ 2
+-- 
+2.17.0
+
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
index 97e18f2d896c..955c950bbf9e 100644
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
-inherit cmake-utils vcs-snapshot xdg-utils
+inherit cmake xdg
 
 DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
 HOMEPAGE="http://juffed.com/en/"
@@ -29,16 +29,19 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )
 
+S="${WORKDIR}/Mezomish-${PN}-5ba17f9"
+
 PATCHES=(
 	"${FILESDIR}/${P}-qscintilla-2.10.patch"
 	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-qscintilla-2.10.3.patch"
 )
 
 src_prepare() {
 	# Upstream version outdated/dysfunctional and CRLF terminated
 	cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
 }
@@ -51,15 +54,5 @@ src_configure() {
 		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
 		-DLIB_SUFFIX=${libdir/lib/}
 	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	cmake_src_configure
 }
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index fb0cc85d133e..8aa748e09ee7 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,4 +1,4 @@
 AUX kile-2.9.93-cmake.patch 549 BLAKE2B f93414f3b09b45952a5082e9c9c0cd53b01b7b2ee3b080e6d4ef554cd3cbbf84f60061e1b4f9d1ab060f2e4ea221af3407140f9d897bece353691d9f262033e2 SHA512 be9a14c712c05bc63b1bf31eb959083580913c2ae37f642eab86f47a07f75d63d633fa154cce2ac65866b25da530cf0699e654c7b05ffc4361d35bc389a13faa
 DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
-EBUILD kile-2.9.93.ebuild 1514 BLAKE2B 16c6df56575bb9f26ae1c20d0e019ef3a3ebc066471817650694cd068956694163ab00c873846ab3a94af3d5fdbdd35a679e291ad28e6fec37dad4c0b51313da SHA512 419dcc82a8917a8a6d95891b0e6aef00f2a1a55b6bc4818a5c7fec0253e3785e8b1cf85c2f297461f1c204077381a35ef829f178759e335a9d33aae02f0f0be1
+EBUILD kile-2.9.93.ebuild 1717 BLAKE2B 06e3bb50cb1d6046ab51f705f82c7ef01d316376490cd61ed45a4f5180d9d46362f2c6004f947f55ec22b3489ef253c1f94fdbec358e71f2fecd492048218c1d SHA512 229a52d69a1b043e95786adacd56204153201c578d1a003759074d29500982cdf512885fb7239b061b356546ede8a86b81d630af2fe0aa47ae63a433f6443bca
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.93.ebuild b/app-editors/kile/kile-2.9.93.ebuild
index 2d64261c3d44..e13393daca2f 100644
--- a/app-editors/kile/kile-2.9.93.ebuild
+++ b/app-editors/kile/kile-2.9.93.ebuild
@@ -3,44 +3,50 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
 HOMEPAGE="https://kile.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="amd64 x86"
+SLOT="5"
 IUSE="+pdf +png"
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep okular)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/okular-19.04.3:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdoctools-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/khtml-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	pdf? ( app-text/poppler[qt5] )
 "
 RDEPEND="${DEPEND}
 	!app-editors/kile:4
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep okular 'pdf?')
+	>=kde-apps/konsole-19.04.3:5
+	>=kde-apps/okular-19.04.3:5[pdf?]
 	virtual/latex-base
 	virtual/tex-base
 	pdf? (
@@ -59,8 +65,7 @@ PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake_use_find_package pdf Poppler)
 	)
-
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 056ba88eefe6..b6d8e46b9e71 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,8 @@
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
-DIST nano-4.5.tar.gz 2957974 BLAKE2B cc605cec46ba4b7328eb70af42da067a30b07ca884a702d20e2294cc3a6c4d7166aa279f6aa044d4655effcb783ab7371feee3db788c2b15587f85f66e03816c SHA512 68dcf95ca2b02d518a915cb77c51f2af42bab82d38673feff06b6afdbc31530ad7d63fdb083077cfe23181df03fbbbe1f00e189e79aff0e12d5dbe26220cadac
 DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58 SHA512 76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
+DIST nano-4.7.tar.gz 2977920 BLAKE2B 8373ebf3f4e98ba204ed00678ba1e8791c9ffc11226baa98b7dac9ff9389cc465dc6574833ce222570301232a97f87e1b8d505dcce617f6c8bd915f4a662df4d SHA512 2cbe2341bba46f57a692d6deb20003d992da0230fdec3a2dc485d3b03d2ec2a70e66d05299bbc719fca658c8a8060dd64d4b52e68aadfd73980b82445761615f
 EBUILD nano-4.2.ebuild 2167 BLAKE2B 7a1770c86696d2daa754f4081b15b9eac55471708a8c4da56caa9ba02a5b703643eedc29429b509adbf5a02f65d546f2aae7a378b2d5c03079cbb7931f3d5019 SHA512 7c475d9ec61e69176964ad8105390832738be2be6ddefca50bb5412e6bd0dcc7eb000d452145ebdea562f947dbdff05d3d7470405d1b1b168aac8b7cf27e9983
-EBUILD nano-4.5.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
-EBUILD nano-4.6.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
+EBUILD nano-4.6.ebuild 2170 BLAKE2B 0f57307e8cb772be9e724eb03605465c41cca60e941a99ae7add2a31cfa1066d25b629721a25c7a3166d33bacba13965543c6ddc7c819945642ae451df93b8d1 SHA512 212eff2f9f01da5e094a378f5a46c968e853423049a93b4183ecb973926cd9394edb12f0bc2012d2c207b028377a4957d5d49ba1be45e3f106894c8e8b88e5ac
+EBUILD nano-4.7.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
 EBUILD nano-9999.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.6.ebuild b/app-editors/nano/nano-4.6.ebuild
index c3d78b31034c..ed4ecd485072 100644
--- a/app-editors/nano/nano-4.6.ebuild
+++ b/app-editors/nano/nano-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-4.5.ebuild b/app-editors/nano/nano-4.7.ebuild
index c3d78b31034c..c3d78b31034c 100644
--- a/app-editors/nano/nano-4.5.ebuild
+++ b/app-editors/nano/nano-4.7.ebuild
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index f9b361dc06d2..745463311753 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,8 +2,8 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07f
 DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
 DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22
 DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
-EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
-EBUILD neovim-0.4.2.ebuild 1870 BLAKE2B b9ba9926cdd2dccbc6826f9bb91a11fc5bf97788139f8fa477c1c7c6620a1c0329d102388d142fbcd3ac1719360d70f7931b17f6434d0af63f8735ffdce5157e SHA512 ae453ccf25df891819e299b7b77dc24a7d5a7b2c5feaeb706a65edc49d12189be3afda361c8dcb2b8239b22ecc84fc27fe9dfa91db2813520b21b2057f6b72e7
-EBUILD neovim-0.4.3.ebuild 1872 BLAKE2B 7a345fd61dcf11c2c60991b72cf706e8f17ef7afd2cca19d85e8b90c886756c1732ae73872f439627d43f9f1984011614e4546b05c8a0b0ad43e6681294ac4b9 SHA512 b9b1add7ebc3d6c623bc1d1413517108acd066ea2bb6b7938132cd3073cea1dbdcaebaab2ad12e5fa5c1566ab9e7229392d80aacc04b51fef3f6cd06b15f3b50
-EBUILD neovim-9999.ebuild 1894 BLAKE2B 72bf20b3a2d0bf7c4e69f413519ecd3120c86ecf83ba001faeb8e2a82ed87fd01040069e50cea35b52f7d6b253554ef0f10656cd5d59687883c65abff839f950 SHA512 1ba08f8e52181b82e44415d68e2a372e3dbaf2c54f5f05561bef314ed5905f434fcc3028ece08cc9e3be8ef2169e2b0a9424e244e71bf9da7aad81e4462a2c9f
+EBUILD neovim-0.3.8.ebuild 1897 BLAKE2B 00799391504976461e2f154d1f5919866226ec26f40b7b3204f33e8b56cfbc3410222067d6e078dfb91fe4b7d2587110d99e0675664d9dc9e9d2d3902d62ed91 SHA512 b6ebe40492f0411020907b113e3444bbd2b7480fb3b5716bf9eb5c3a7ee6daca183e79d10fe77657bfbd19bdc31d12435611e2cb028763c22d2dba19e8f4cb7c
+EBUILD neovim-0.4.2.ebuild 1846 BLAKE2B 3e159b6cd82170b039f10781df9b99e8b2ce5559b573ab54b003e0bb461f999ba02d705efe0568bc8fb080c8ecd4a2e4eb68690d3689e61c6150f4d1e3a8b775 SHA512 620175aaddcb9b727dbad52b235377bdcb9f1865ac344d0aab0f7c5c41504b4c1be37aea28bb85835ab6a9fbff8c8215d3ae153699318ef2c2437c4c8ad77c3d
+EBUILD neovim-0.4.3.ebuild 1846 BLAKE2B 224a144b097bd8408f291a0d85ea101abd49affef14091ccac8a63a95972971f2dc9d5d97a807123667f64820d3233d05a1b868b70f491dcdbe780206cdbe0db SHA512 dea497ac68cb3e71f810f70af91a23e2ef8373cae73ee39ae360304fa4e1cf5072d4992a78b78be4eb8a0685d47a8fe19e20f56fd25f336278e64ae92ad0b0d0
+EBUILD neovim-9999.ebuild 1870 BLAKE2B 9d966a25c0baeb9c58c376a2765471bb6482282e066fe90ac23f7cdc031cb995078375d728da0dfab6d7e466ab42ff6d2f6b2c3b5e6ac8e2371b307e200ccd91 SHA512 fc70ada70af311a1d632383a045e07ac5f96d8fb07d88e9e0db618cbe918d1bc7b4b77cc4b213e37655a84778d4906bff8262d43a5874d00d3c4dda4f177b606
 MISC metadata.xml 862 BLAKE2B e9725c43d1a34d8da4fd779a2a945594914ed51a2fc0b87a9a2a6ddefcc8d38d88c94c426a59df9f94b08045b2f8820ee205e7982a19c15f1872d2a73b35fae6 SHA512 9eb46f7862d26c27f400d22023ac3cc81f5671e8b17d4f52b0743abcfdf53d63366cd16c06ac1e391f02bf35fb9b70e0864eda9457c1f45ff74a06f528d1b8a7
diff --git a/app-editors/neovim/neovim-0.3.8.ebuild b/app-editors/neovim/neovim-0.3.8.ebuild
index b22a6a5ca7c1..52b26cd51f4b 100644
--- a/app-editors/neovim/neovim-0.3.8.ebuild
+++ b/app-editors/neovim/neovim-0.3.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
@@ -62,7 +62,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -71,11 +71,11 @@ src_configure() {
 		-DENABLE_JEMALLOC=$(usex jemalloc)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/neovim/neovim-0.4.2.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild
index cf111db0b07c..525ec586a27f 100644
--- a/app-editors/neovim/neovim-0.4.2.ebuild
+++ b/app-editors/neovim/neovim-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -58,7 +58,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -66,11 +66,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index 0261cc8dfed1..6f27a67c108e 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -58,7 +58,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -66,11 +66,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 97f2f678904d..6647b38da751 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -59,7 +59,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -67,11 +67,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# install a default configuration file
 	insinto /etc/vim
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 80c08b97e839..a13f7ddd2c69 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,3 @@
 DIST okteta-0.26.2.tar.xz 976264 BLAKE2B 6bd0708ecab61097130ad3b96d44c4a58a7711f6d9ecc9c70d3db792728489f395e691b0157f0cf8ffc0e07b1796ce6fde9f689108c3236412ad37c4e87a210a SHA512 9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246
-EBUILD okteta-0.26.2.ebuild 1597 BLAKE2B bf80b3ec28941d3750f465ddeab47d2ea3205aef2e19afed1dc6e86838502c3f8b3c25b57ccb6ecdda6f915c8bdbe6c8546df5e514ea54a7e052e0cd955dbd0c SHA512 8308e035b285e99e6f6ccada7154bc9154b6bf266d0858fce3db9f3001552f7f9fb76a0595ebcee27418140fc44e9dee0da0bba648b8070a8f733010c4d100c6
+EBUILD okteta-0.26.2.ebuild 1591 BLAKE2B fc5ae8e0096950c34f2d0a2929a63a1eb0a143d6fd99bfdeff9cd9780703de207fae12214ef5aec131d34e8c0592398e8cf0009313983e9b57e74f5242630984 SHA512 c9fa8774ae09325dcd21641cc0f3f5d5a216c9d3db278ca3b9f778304a995488a6e862ef1c48cafb62dd8383c2e9f400053c1679376388ad53ba20d7b9f196ac
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.2.ebuild b/app-editors/okteta/okteta-0.26.2.ebuild
index df4a8bac55dd..4e9dc984c24f 100644
--- a/app-editors/okteta/okteta-0.26.2.ebuild
+++ b/app-editors/okteta/okteta-0.26.2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DOMIT_EXAMPLES=ON
-		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package crypt Qca-qt5)
 		-DBUILD_DESIGNERPLUGIN=$(usex designer)
 	)
 
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index d5ecadf246c2..e2dd17ecfb1e 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -3,8 +3,6 @@ AUX qemacs-0.4.1_pre20150916-nostrip.patch 1162 BLAKE2B a84d798d0a2d97b6413b10c0
 AUX qemacs-0.4.1_pre20170225-Makefile.patch 954 BLAKE2B 16fce167962370753730dbe61ee5cbfa4d1e7b208bd350e433eeeb1bfe9eef2892a4532e83675b6c40344aed04df38c8236a01a7ff3db5fa6ec5592ec1225c18 SHA512 8146d383e53df6a5c540581925d85c2eff3dafe5cd78a23a784f3fc4fd41e23804f1287dc68597b33582f9beacef57df4a80a1930399b66566c77ff5e17eb227
 AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c5706788036665271cffee46a4b896573de3691c3e8cc96db9972fd0f170033b9d85fb048578c8cf3502a53a5c4ad8b7c9858c0771e195a42 SHA512 1c81e3570a2d00df04fa9a4dfae404be2f1c684b9b86ef67aa3f13a4b6f734d99d768350d41c75dc8c2874ccf853d021e497c87c751d86e2df1015f42fe97889
 AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
-DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
-EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9
 EBUILD qemacs-0.4.1_pre20170225.ebuild 1519 BLAKE2B 625375983bba8a8fe37511edbc3d4d07fb7fabc4bf5bf0ef9e87a4f816d7c4a6ad9cc71c24fecd9e37dc038a70c5f37fc04c08d1c4b01605f7fbe153139852fd SHA512 02d99ab6f3e2800694886d463ebcf1534b12fea705a3f5e0dc5a3d05cce43d2947edb04049979c91d55f8c2825327d3a10339078cc208d68b8a12bb691ed4907
 MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
deleted file mode 100644
index e2b107ccb13f..000000000000
--- a/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="QEmacs is a very small but powerful UNIX editor"
-HOMEPAGE="https://savannah.nongnu.org/projects/qemacs"
-# snapshot of http://cvs.savannah.gnu.org/viewvc/?root=qemacs
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="X png unicode xv"
-RESTRICT="test"
-
-RDEPEND="
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		xv? ( x11-libs/libXv ) )
-	png? ( >=media-libs/libpng-1.2:0= )"
-
-DEPEND="${RDEPEND}
-	>=app-text/texi2html-5"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-
-	# Change the manpage to reference a /real/ file instead of just an
-	# approximation.  Purely cosmetic!
-	sed -i -e "s,^/usr/share/doc/qemacs,&-${PVR}," qe.1 || die
-}
-
-src_configure() {
-	# when using any other CFLAGS than -O0, qemacs will segfault on startup,
-	# see bug 92011
-	replace-flags "-O?" -O0
-
-	# Home-grown configure script, doesn't support most standard options
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--cc="$(tc-getCC)" \
-		$(use_enable X x11) \
-		$(use_enable png) \
-		$(use_enable xv) || die
-}
-
-src_compile() {
-	# Does not support parallel building.
-	emake -j1
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc Changelog README TODO.org config.eg
-	docinto html
-	dodoc qe-doc.html
-
-	# Install headers so users can build their own plugins.
-	insinto /usr/include/qe
-	doins *.h
-	insinto /usr/include/qe/libqhtml
-	doins libqhtml/*.h
-}
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index d6c7ac14a412..c573bddeead7 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -2,6 +2,6 @@ AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
 DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
-EBUILD qhexedit2-0.8.4.ebuild 1824 BLAKE2B bf51b60fa58333b2fa727adadd3bb35b0215a77773b51d856dafc1cda3702834e074735dc5a908dadd41134d767e81e8ec6f7fb83cad2de139dd9023df890fb1 SHA512 610257b125661932965e7f6a2a4e6db53bb552382b0f34eca35729da9179d3668629d30e70f07a6c29b6aadcf45c123a28b05c066603079f6669f9ae6e52b5b4
-EBUILD qhexedit2-0.8.4_p20170719.ebuild 1918 BLAKE2B e20d884970da32077ca574299b8efef94ad827290270521933d716e67be5dd90c317740d7870756bd4b56b9c06bf3b344e59304b7d909f3109f67f6f272ec14a SHA512 17f03387ad5f06dd448ce344759c67cbf33267b5f7c6c7637566c17d5b683c0d1f6dffb7de1320e41b7725b5b7f1b3bfa840b402777a6e4f5e76f8bd11621094
+EBUILD qhexedit2-0.8.4.ebuild 1817 BLAKE2B 12c2f366bc5ad787cb2f8a49e7ba4eda2a63b81707b75188a6d456a7baf8b42b2d38d1e38c2a4a593f2d21bbc9499cfe93194806e817d6ce6c2615c0b7a7b3e4 SHA512 c552c67c8f0962b9fa5dee2565e407380c4fc36627434bc012d7525934cbc6295b0476ffa122531794c86161caa30529457ad9355b9a8ea6f739588017282beb
+EBUILD qhexedit2-0.8.4_p20170719.ebuild 1911 BLAKE2B 4f1819134fca332edef84ec6a254c88dd46bfd1e0e55c9d816bf26ec3cbb43d3323d9192568f86053f25b78155065fd5aaec8f0918357ac4bd9c70672c13b3bf SHA512 3d2395bf96e04e188fc5b2defe6b8c21e6d653642fa735b39c4d372574f96a961c40318bc12ca6700fc97e8a021da3e16aaf23b9824563222e8363fa708c53ce
 MISC metadata.xml 991 BLAKE2B 7faabbd43f1bdebee332845029ceef0824e380b70b7abe2adc9840391bba736941851433d58324886d4821f55ac83c67ff604b32d648acfd4c7e420662c5e155 SHA512 b079492a11df201b941d91991aef6161971ef15f80e7ca3ea71df2a0dbf2f193bc2514502e179321c7f688eb4f129401775bca9d9b657e3eec45e13c4c0948bb
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
index 1de535b4cde6..0563e606546b 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2017-2018 Gentoo Foundation
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 DISTUTILS_OPTIONAL=1
 
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
index e4e30e3c8f45..f3efaaa2f28e 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 DISTUTILS_OPTIONAL=1
 
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 0205434687ba..773e57e4db73 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,4 +1,4 @@
 DIST ReText-7.0.4.tar.gz 402934 BLAKE2B bae66a5fb8e81192d692d1a239706e2feee6ee940685cffdf3498880b2c9bd67cc85c6150e372a383e4bad13da210426fff95c06b2861b58020c2c6d298cf5d2 SHA512 cb12666b15414f4bf83f3b07c94d3bcba13dd3e6c3832c66520bfe8caafeeb87cc083a1e74530d98d6e00a00363add55fdf873e6de385e637876454130deebb3
-EBUILD retext-7.0.4-r1.ebuild 1848 BLAKE2B e5b1d86978cfd091521ebcc4490581894092490a89ce5ea00ddff9adf39941b6c24880f795fa171012a6ff417daa17ae2de1bab3a9fc419d784b4cb06f66ef2e SHA512 bf7e6f06f58b0731546921bc454c4460bc7d5ab69ec648b71d7dec70a68de0f466a8366896f2e8718f01d9a1f06f61d9dc0a5cd52eab2405d5d0c6edaae224cd
-EBUILD retext-9999.ebuild 1850 BLAKE2B 1f8d204ad1607417ed640cb6d87bf03f7579526b588d6d3895a892d52535101f83df506b445cf91b39bb0a69dfad831dc84996098b06c2d1725b6db6b8dcbd80 SHA512 031f6207f65aaa133dac663ccc316864d89b7f52b3dfec1289d36b391176a4333c1b25bffcbfccd64f745dc808e38396c8c6936f45208f92d9b36ae805660427
+EBUILD retext-7.0.4-r1.ebuild 1846 BLAKE2B 3b30b9b5b486551f5ac7b1da324843ef7fbe6e0a8d2df3d787b52dc72b1e1a18e755c3cfe29e5b057d0fe4294c7da81263fe831fa44c80346d3f7094a6bc86cf SHA512 a8839bc8c0a3ca39649b6af774f8a65e496e21cd866059e67b7caf18403d6b247a3f917ade610ec074e00857e5374e05173f3e23a336859bc23a0731e5f1987a
+EBUILD retext-9999.ebuild 1848 BLAKE2B 4a75d45db8f9b49a6d51c65948977f3131f5cc835eb98a38bf348f116e1097a25e7afcbeaa38d63a1fbcefdb06ca46f0f11cfe87d666a82a1643d61e7f760f34 SHA512 a362639fbecd506f815f01fc39d299f99810b3d1c7b66017e89c20b4ebbf868fc8a8583b16cb17fceb84006180e2d214bccb13e74532332e563e1057c6513e4f
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/retext-7.0.4-r1.ebuild b/app-editors/retext/retext-7.0.4-r1.ebuild
index 2f487769f11c..d0afdd8c5c66 100644
--- a/app-editors/retext/retext-7.0.4-r1.ebuild
+++ b/app-editors/retext/retext-7.0.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # no pypy{,3} support as PyQt5 does not support it at 2019-05-15
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 21b6ece05bcf..44d48af58513 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # no pypy{,3} support as PyQt5 does not support it at 2019-05-15
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index 2412ce1427b5..2c82d5af360f 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -1,8 +1,6 @@
 AUX shed-1.15-cflags.patch 249 BLAKE2B 6249d526da1a4b1df8f456692e85bdbd275be7517d5af89619557186afdfd5fd6bc2ca50299decddcaa33408608c35c5cf7ba74e90b78aba9825d4656c1557fb SHA512 9f6f025c5fc5126357e8b763706d2a0eb53700963b0d8779f057683fc95773753eced99b26a9120b122f50c8b23db6c6bf79cb973023b11e594313c8fcf92cdf
 AUX shed-1.15-interix.patch 313 BLAKE2B 423d51410a5371ee1fa0ae2e0d4426dddd410ea060a269f6d3c6b99826aa8d57635bb9a0cfeb82fcf2f51dcf179b0815485491110df3501d1e23ff950d838475 SHA512 31d403d95ce106443ccfe8c92b9621842bfc4264c71280398bb7c0d827d98bf28b403dce3c6ae4523b7ac30a8f529aac6d7cc30a91313a2e2a3d033766469e69
 AUX shed-1.15-tinfo.patch 355 BLAKE2B 5acffe509b9174187b4383f15bed90600790ed0267ee1dbc2713a28e2b8fd0a5eb67cdb1f84a635012128abd5075f9daa0ffdc86abbdd29d170a9b48868dd52c SHA512 fab71c3e99138f7cc4844964bbc40e95c90055612e6d34ff59c72b505b2c12c6244c4a25091de283f4615475652c202a4404273c0718b73b9f928c4bf0a74710
-DIST shed-1.12.tar.gz 57934 BLAKE2B 33c6096b60142e3a893827b68dc81cca03b53e0d558041d7042cd0e32450b1c5898218c9141683dbd50e49d6e03c8f0cc4090146de4762fedc22157c1d4d3914 SHA512 f668245478b88e74911a5f6bc13629b1be9412056bfb42860554979904451b20cb468ae7a9b2daa8bea83d7f78d3d0c016170767dd80f0a93ba140a51ad02097
 DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
-EBUILD shed-1.12.ebuild 393 BLAKE2B 3da73fe8d3dbbdb2113c8fec5304e6aaa78be4f3ab0e992c52acdc2cc412e82ef351c3ca55316f8e1aafe0e0973f50d3886a18e1091f6e5482345587853b3c79 SHA512 9ba910b953384f033f2319faaf2b127885b01db2b072b41319e61481c4105c1386eac83f9f8be038b39048c5f64195511dd43d5893e4fc083644443e173b09bf
 EBUILD shed-1.15.ebuild 588 BLAKE2B 5f63238a8fa37e46de6b404fae01560b309e6ebe52c929dfb5d3f0ae86f20c574223afc202b942c3be9fa6c45632abb5d53c4250ed95965e9a624c15d479b68a SHA512 7ebcbae53daff16b1886a8625e38a3c6cc8fd91a0e897711477c1f9521e6873f1b9f6dace8ededf9cd0962da87fd73b424b630e21f0a45f72439d9a2c9d94707
 MISC metadata.xml 299 BLAKE2B ae48e2797586095e3e0d22645c036826b7165079cda4be2499cdf201e37806f0600086f9b0a6d52217b63f63e759c5d2ce02bddb2f828d1d4719898b0ad7f3a9 SHA512 ed903a7f91fa008f63e358253d7e66988cb57b616a8bf6e546f8a1d874e92524b29ef671a96f0e8fc56410619ff541d50e65ab788cf5373164d58b7afa625868
diff --git a/app-editors/shed/shed-1.12.ebuild b/app-editors/shed/shed-1.12.ebuild
deleted file mode 100644
index 55cedd512278..000000000000
--- a/app-editors/shed/shed-1.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Simple Hex EDitor"
-HOMEPAGE="http://shed.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DPEND="${RDEPEND}"
-
-src_compile() {
-	emake AM_CFLAGS="${CFLAGS}"
-}
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index 7114a78a237f..c2743b2ba743 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,3 +1,3 @@
 DIST texworks-0.6.3.tar.gz 12082640 BLAKE2B db5b98f9226e0e7e109dc06d8e0a88b0e8f0dd237676ebec3be55308c720eb6dada25be061d8d5dc27949b9673e93fd65c8ddddfbe03aee4f8170471c52b37fd SHA512 389cf54441e74164fc842f2f293cdee45c6ff9fe202f262d32f3fb076de9a29813a62cd75052969293f2f784e0722215bbbf2206e75bc836a13d495bf5aed653
-EBUILD texworks-0.6.3.ebuild 1391 BLAKE2B 7177a5f267eac24739cc32e65a0b241059b4417d8a5abaf5218fd7e7947afdc8c24c51fa4a1b0f08cbd12d15a7bf1df35d917270571f5e50900ca40cd04e9938 SHA512 a9a941ee5ec286d14d2c4ceedac19750bab836cff0ebf36d4b0fb7d8ccededd87f3e8a2f2ff87face5e475a0c43b9123cff5ba70a2bd9ef084682990a2077f0a
+EBUILD texworks-0.6.3.ebuild 1387 BLAKE2B fc8cadb7a3cc17ff450705d0925946891b75f0d574d9bed6ce50e5ccd3a739353e522035683d70d877a54511fcf16d43fc4b1c688b4860869b135b2abb3455a8 SHA512 8991744543c3f456733e10e264ef6311312309408162c5daff459c6c5f7067b1abd49b20d5f116d4718b77d10bfa04414a5098a1c6ee6a0933865a9ab88fbc91
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.3.ebuild b/app-editors/texworks/texworks-0.6.3.ebuild
index 8d35ffb49142..d9fa4f242770 100644
--- a/app-editors/texworks/texworks-0.6.3.ebuild
+++ b/app-editors/texworks/texworks-0.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit python-single-r1 cmake-utils virtualx xdg-utils
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index dc237da39515..7c67ae0f872f 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -4,7 +4,11 @@ AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e2
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
+DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
+DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
 EBUILD vim-core-8.1.1486.ebuild 6915 BLAKE2B 2d44adfb2dea395989f9658b0d0e1957c965424e035ea321837117f9223418e496fb55f8e04b3176001aae546197cb72e4274d6b137a92697c2defcdcf3da149 SHA512 e294057a7bfaed7787e7a37c3a806a218b7d6c374e9f01fa054c601a38a446ee0ca6c79d6e69c40a0b01c2526b7736a2fbfbcfb2ddcc47cfb074626c0bdf9f16
 EBUILD vim-core-8.1.1846.ebuild 6926 BLAKE2B 466e6b784517dcd1d71a23bb1daba145e01ec8fb09d1560984c5a4641bf03177d36dd43be67402f7b87fecca7bfad264d54d404d4355c9a4f141f8bb1821fd62 SHA512 a660417f9e9d5493d49c9c118e38de7373ef1429093bf68577a535083725dca32a8415d44d50165ca29d369cb1b2211ee8fb3fe0c415709b35247ddad7efec50
-EBUILD vim-core-9999.ebuild 6926 BLAKE2B 466e6b784517dcd1d71a23bb1daba145e01ec8fb09d1560984c5a4641bf03177d36dd43be67402f7b87fecca7bfad264d54d404d4355c9a4f141f8bb1821fd62 SHA512 a660417f9e9d5493d49c9c118e38de7373ef1429093bf68577a535083725dca32a8415d44d50165ca29d369cb1b2211ee8fb3fe0c415709b35247ddad7efec50
+EBUILD vim-core-8.2.0055.ebuild 6926 BLAKE2B 5c50fb2c6a266ab19f8b8aa9bab7c099a1d52d3735de9404a74920de926ffc9994b66c526d777f918d64c2f97cfe0d44bc7d17757dd226f0758346a1a7f01e37 SHA512 a0f833d10f85ce8695b205be4b026e6aeeb189fa7817f02b4f5b657e7d95a88267d51dead4240ee1bfc10dc79157885278f62a12f3b89e906d39f681e985f49a
+EBUILD vim-core-8.2.0114.ebuild 6917 BLAKE2B 63b8d9cc79678377f3b8b2c1a3ca59061080dced4eb2a3c38259265f7d08573fb7f0cd3a0e7d0bfd9e748198bdb5d84065955e12013e3f68ffa0c989de8e825a SHA512 7d70d62bd36e97a1c021f81098bc3adc614518045401f77ad092b891bfda8f0d2e1792e994fd79159db88ef09fb164218918738ef652576ce4b59d4c6cabe9d9
+EBUILD vim-core-9999.ebuild 6917 BLAKE2B 63b8d9cc79678377f3b8b2c1a3ca59061080dced4eb2a3c38259265f7d08573fb7f0cd3a0e7d0bfd9e748198bdb5d84065955e12013e3f68ffa0c989de8e825a SHA512 7d70d62bd36e97a1c021f81098bc3adc614518045401f77ad092b891bfda8f0d2e1792e994fd79159db88ef09fb164218918738ef652576ce4b59d4c6cabe9d9
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.2.0055.ebuild b/app-editors/vim-core/vim-core-8.2.0055.ebuild
new file mode 100644
index 000000000000..45e3680e2efd
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.0055.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.2"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+# avoid icon file collision bug #673880
+RDEPEND="!!<app-editors/gvim-8.1.0648"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	gnome2_icon_cache_update
+}
diff --git a/app-editors/vim-core/vim-core-8.2.0114.ebuild b/app-editors/vim-core/vim-core-8.2.0114.ebuild
new file mode 100644
index 000000000000..b5cbae1c222a
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.0114.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/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+# avoid icon file collision bug #673880
+RDEPEND="!!<app-editors/gvim-8.1.0648"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index b12aef7dde9c..b5cbae1c222a 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
+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
@@ -213,7 +213,7 @@ pkg_postinst() {
 	update_vim_helptags
 
 	# update icon cache
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
@@ -221,5 +221,5 @@ pkg_postrm() {
 	update_vim_helptags
 
 	# update icon cache
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 95baa09b0db9..4af86e9011bc 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,7 +2,11 @@ AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-EBUILD vim-8.1.1486.ebuild 9071 BLAKE2B ccc015ffe297ef875c31f05ab802b14785d4e020975b251b1dcfbe49a93662a6c543c4fc3645a37c5882a8357419f1bf241328890769cf0198a2d05c5f56f1fe SHA512 0d968e45730203fbe7a936a3329ecf107fad7edb5fe53b524873bb71aebc9dbbb602580d3775cbf59d56ffc27caa70e6078ea374e9fe75b45df3167971fbc0c0
-EBUILD vim-8.1.1846.ebuild 9158 BLAKE2B 2128b3794ae8d7957c74ecb63bb06fc1b6b4a3cc17fbf66925fe775eab9b466f819e80a68c467497591399770d0023a83611b9e0e32bb7552f30bf4c2a5f649c SHA512 0a91a04386d233913f888a90da840ef33846e9d450d6287d7b7c64712cdbae765476c866be0d729c638192e0ac9c90a4bea7656210ad60656c64c43f5f9e76fe
-EBUILD vim-9999.ebuild 9177 BLAKE2B f1e49f697e9dd013d586ac25859cb5f9e42a4f4b133e86103c182743592a736c05d4ffa9cfab92bdb02ac7f589c0ce3257a0bb4f5464ffe5d483d7c3ffe6c523 SHA512 86d01ac13dcbbd16e0932d486ec986f829fff21c72efa3a557941dd9ac69085a0af9c7597011beaee3adb323706c8fc329681e487c5f74221f29e9c366427f16
+DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
+DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
+EBUILD vim-8.1.1486.ebuild 9067 BLAKE2B be4836c179288569bf5de15e3e50dc879676f86be1d84810dea0e33d454603f407d1f1327ee38b9a3841a6a67e690af0b26bd3557b245b9caf2a309af01f66fa SHA512 6e0e205b33f62ae2f97b989e22bd39365db7d687e3e5bc56ec3e811dca6e40c295b05de7060ab31f109fa9df2e3c93c6adbd97a470b0ba1251e177f50ae949a7
+EBUILD vim-8.1.1846.ebuild 9154 BLAKE2B 9963fe3bffcf4ecc6ccb82751152e6f4428865c00bae9c8f7e86ce9038b2f791679c74d4b14bcb1cb0eeec97998745263851ce58ca26c9cb3f9392b007ca578e SHA512 3ed6f3180065ce544e3f48cdb8cad923188511ca2170d5145bcd0ae4e78a22a964db491e4eafb56f2ec791c81369dd0f09ca6ad438347c232751763a3852a1fc
+EBUILD vim-8.2.0055.ebuild 9154 BLAKE2B 2d3d69e1fe5e8b777dfe7c2e6a34d0f00e739cd162e6306a2fead62c795b799fe92f03a48e8c9d150a5d609d9aa11190afdb6e229d2ae2ca6a4e8faa0aade033 SHA512 d8f6c1c253d01df537e2c6edcbc964c8c1ce7035967eebe5c0c9511acb1bc4411c999bf6dd3acc4d95edf7afb9382214beb3dd7a73e023cd8a7b706a3a86c1af
+EBUILD vim-8.2.0114.ebuild 9043 BLAKE2B 3dea56da891356560d81f8aad7ff902bcc6e7aa30478051b0ca1704483b8758919547de3461f874fe09c637298ba8703eba4cbc98642d69545e103c2ea2e665e SHA512 2e4fd2908d6e5bda8aeee29b37dfcb6ffda2c5aaccfac820dbfff58663ab6ca498c26d0c5cc32e7809ba70e655aeedaa5962bef3fe2aa0d2f1b2f728fc9ba000
+EBUILD vim-9999.ebuild 9062 BLAKE2B 637721a3b1b66fbd7738b3af885ed8867627994e1ec7131647fc67b73fc74558f60464a4786b27bae0f4775c4ff4fac711348b5cfb1254ac4b94505f470c4ee7 SHA512 60cde8a76286735f4bde290ef4f8dc2338997a89dc922221cdcb4d255028c59069eebcb6767bf321258c495d062269fc1182671a9c932b7ce6d96d217b163b2b
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.1.1486.ebuild b/app-editors/vim/vim-8.1.1486.ebuild
index 523b701d7e45..0eb8f9ece42b 100644
--- a/app-editors/vim/vim-8.1.1486.ebuild
+++ b/app-editors/vim/vim-8.1.1486.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26"
 
diff --git a/app-editors/vim/vim-8.1.1846.ebuild b/app-editors/vim/vim-8.1.1846.ebuild
index a5ce18ee59be..dda7aa265740 100644
--- a/app-editors/vim/vim-8.1.1846.ebuild
+++ b/app-editors/vim/vim-8.1.1846.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26"
 
diff --git a/app-editors/vim/vim-8.2.0055.ebuild b/app-editors/vim/vim-8.2.0055.ebuild
new file mode 100644
index 000000000000..f397bd99178b
--- /dev/null
+++ b/app-editors/vim/vim-8.2.0055.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? ( ~app-editors/vim-core-${PV} )
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_with python python-command $(type -P $(eselect python show --python2)))
+			$(use_with python python3-command $(type -P $(eselect python show --python3)))
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-8.2.0114.ebuild b/app-editors/vim/vim-8.2.0114.ebuild
new file mode 100644
index 000000000000..617022926398
--- /dev/null
+++ b/app-editors/vim/vim-8.2.0114.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=( python{3_6,3_7,3_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/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? ( ~app-editors/vim-core-${PV} )
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python 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
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 704472bff111..6f2ff73fb529 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
 
@@ -203,9 +203,7 @@ src_configure() {
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
 			$(use_enable python python3interp)
-			$(use_with python python-command $(type -P $(eselect python show --python2)))
 			$(use_with python python3-command $(type -P $(eselect python show --python3)))
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index a8995714f7c0..f3e32094f6f0 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,5 +1,5 @@
 DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
-EBUILD vis-0.5.ebuild 1618 BLAKE2B 2f2262c0a88362868b44ada3e6943bbb9861dc686d351eef98373deac0f13bcbb48de89cea87e3541293834ce8acbf9e349143bcfb38620b7caf9483ec606ea5 SHA512 85d3e8cd22266a35400803fef144a7e26e0a404d70f2ca681c4fb02674ebd1244269a58856f4a6597e0500b562082494ae7e50caba475f54d564d6b05b471cf8
-EBUILD vis-9999.ebuild 1327 BLAKE2B 86d3120fb93c3e28776b58d35fb16360862174dfa9998d1ba6ba2ebc6a6dc88e35f78f0c630a554f7701fe44f3c74b5f560f19daa3ed8d1eb3262b64805703f3 SHA512 f5842ce9cb0aba3b25391873a96914a9783191de31cc4a7b26c7d919a684edaf7c94bd03a848edfd5ad5b5af0b2f94c69346b60dee8fe4f6755497003283306e
+EBUILD vis-0.5.ebuild 1615 BLAKE2B f127a9c44eb2b981fca0b9cbafbba7787b9c69b27f7a7a4524b129161bfe390d24365159a036663dfd7b97f4f9642cf6ed5a2f0bb5cb30b8e7e932c2aa86ecc4 SHA512 6d8424bbc0b30b4141d257f21ce1b40275145f152a3082a5920032f4a6869a883cc1e46f9c8dc0ab898b3971dbccebba728dfa01721a705a4402f48b5d7e922c
+EBUILD vis-9999.ebuild 1324 BLAKE2B 54a426f45f1852ffd29162bdefb5645af5e825247c1a254dfdb9993cf317e6e705d88973495d4865a848d02fece7d852716e4088f0ab8592a3e5f7c544745bcc SHA512 14a2619ffec87b4cfdce6a2fbb6891bbb92f743989df343dc2edfd98a9813d7b7763b11187732e9523e65d55ebdd608a3d7a595a42b0aa3b0965a26e5986cdde
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
index 8324eff6c8c1..8e569226bead 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,7 @@ src_configure() {
 }
 
 update_symlinks() {
-	einfo "Calling eselect vi update --if-unset…"
+	einfo "Calling eselect vi update --if-unset"
 	eselect vi update --if-unset
 }
 
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index fb44c4c77d97..b6c9bf465312 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,7 +43,7 @@ src_configure() {
 }
 
 update_symlinks() {
-	einfo "Calling eselect vi update --if-unset…"
+	einfo "Calling eselect vi update --if-unset"
 	eselect vi update --if-unset
 }
 
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 133dc7d1f5d7..29b4b532aa35 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -12,6 +12,7 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r1.ebuild 6737 BLAKE2B a6b3db1d9408e639fba375220a9016c037644777e5f472a4f354e90d56dd3bc3daa822bc5c4fe46a3250212b9c73f2af52c5eafac3df4fa18f211c3d3fe2ea95 SHA512 48aab5209af4ae97a885345919619a1dbaa0fecaf1f3b89c47ad8aac93efcb9094b27615181082939785eb520768c49f1c1a1787946215a04fcc9244b8c399bb
+EBUILD xemacs-21.4.24-r2.ebuild 7085 BLAKE2B 1e799def26063041aa0b65cb96f9f22a33d87370d26a6ab7faa311862a9a653de8fdf2b446355489bcb8733c746cbbe16fc047a72036edba16b389625a07c299 SHA512 2217a71aead967aafc089089a95bf638fe13ad5293939de35ed0feac6b655ca73a9efc90aebf555e65bb59e4aa12e9ddae08a3dfaf26414ac39c784a5e27761d
 EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
new file mode 100644
index 000000000000..1f2018514edc
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6:0
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	canna? ( app-i18n/canna )
+	!amd64? ( freewnn? ( app-i18n/freewnn ) )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	# see bug 58350, 102540 and 143580
+	eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
+	# see bug 576512
+	eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+	eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+	# see bug 615544
+	eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
+
+	# Convert to utf-8
+	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
+	      && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
+	iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
+	      && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
+
+	eapply_user
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+
+	# Run autoconf. XEmacs tries to be smart by providing a stub
+	# configure.ac file for autoconf 2.59 but this throws our
+	# autotools eclass so it must be removed first.
+	rm "${S}"/configure.ac || die
+	eautoconf
+
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+}
+
+src_configure() {
+	local myconf=""
+
+	# Can't build with pie. See bug #75028
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff ) $(use_with png )"
+		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm && mydb="gdbm"
+
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	# Enabling modules will cause segfaults outside the XEmacs build directory
+	use ia64  && myconf="${myconf} --without-modules"
+
+	einfo "${myconf}"
+
+	# see bug 576512
+	append-cflags -fgnu89-inline
+
+	# Don't use econf because it uses options which this configure
+	# script does not understand (like --host).
+	./configure ${myconf} ${EXTRA_ECONF} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--compiler=$(tc-getCC) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-system-malloc \
+		--with-msw=no \
+		--mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		|| die "The configure script failed to run properly"
+}
+
+src_install() {
+	emake prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		install gzip-el || die "emake install failed"
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${D}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-editors
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)