gentoo resync : 10.02.2020

19 files changed, 135 insertions, 53 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a7e963aa582f..ee3f4a6cd44e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8fde92b26704..ea3da37955a6 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,12 +11,12 @@ DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19
 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 10983 BLAKE2B 6ea7fba597d5d6e530870d380cc6be3ab63ec318078e1acfaab5c5ee1dcbc7fd0a67a9c7e5ad650b544f9120727531ccfd6e8d98b82d5517004e3dd8e60e3ea1 SHA512 c82a4ae52c227ac54c099cd8a4ade3eb609933e08f1033955cc64e37528c58acd7deaf0bc33b75f61408d69ec36df15ad293f7a99ce7ce52f27ca43a598473f2
-EBUILD emacs-24.5-r7.ebuild 10793 BLAKE2B 932c2dda8bdeb1d25cd8386cefe0f9b6f2629b10740b3eef9a6d275d217069b331e698379043a83ea6db5cabf10d255e81b0cb335f98add6392f4f0d66d40763 SHA512 391248ec564e56af1f1faaa47ec4b3959185ea6beff218018070086e4c23d465b0e2b9a2e5dc68693d21cb1c1bb3e303faf93c1f64084a137d37e1af3f555284
-EBUILD emacs-25.3-r6.ebuild 11144 BLAKE2B efed82d0494839b10972829cf790664daed5b1ee705bfaa6bd2539e0c5b7b37ecda54d6cefb61446b1c0ce2ee39ccf6a782fc185f7b62cfc7c3afbb426f8aacc SHA512 6ac3ce3567cd670082574b4ae52ed18d25131643a4706ec7b92926301de47410e1cdab0dd3ad8347c602401bcbab2914e0165ca613aa4d0c3e7d70a9938b41ee
-EBUILD emacs-26.2.ebuild 11648 BLAKE2B 8de319f53857df25789f50e02eb5d3dadb79466aca23cae4f2a03fe19987b2815d0cff3470f1fc5488f92dcf6c824159d9b03f1da50b29d7a96e487710393323 SHA512 33296631ea5df408ec71b6fff0c93858762d3ffc011cd9661240b6c4c650bb25066f9049410a8b4f6c37125f855c814ad02ea5de0f3c0d0b510dc5d43f7644e7
-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
+EBUILD emacs-23.4-r18.ebuild 10989 BLAKE2B 3ad43e310856b38564b88300a859c7c672ae1c5a77061c3f756fb0ce5cd6773a9461a7f0c6bf007c0435de261bb7c0e824946e1ee386cbe7300a5c1cb7e9e045 SHA512 dba79e4fce417dfd88130f438892826603d001936d979bed496f00c006033f8c8e1c8199812b38d7855b206fc99701cf95529baad03ff42b9daf4cf559af3c70
+EBUILD emacs-24.5-r7.ebuild 10799 BLAKE2B f3c8b6b40fbccf717546e0c5db9e561f660c1034d34d789295d87629ba13a83341862a875735950dda76609061eb62faff8cd54614d0bae7bc0feceecc739e2a SHA512 518a888e373c8259057e8a49a69e1458646bc89d58a7566599b1b41b626e6ff55a565c77f51c61fc82a337902981441de2458770f0e1ed333312f180b1dc00e8
+EBUILD emacs-25.3-r6.ebuild 11150 BLAKE2B 2d60551e27c503a82224bb30ad1b57e745c2b482778f24db7709a0cfda67764900b211cd6ac0b6f24033aa75182c387582c608e9c69c5748a1d00937ae0a1f59 SHA512 dd6feec0b2616d6c5e9300fb64cd4f166e50c19e91224948f36bff042b7670251c90419d1e15fac00dd12f59b9c874da61ba40414e17de4b670f370e74ff7556
+EBUILD emacs-26.2.ebuild 11654 BLAKE2B 5b0db5155b52b28ccab7657a9aa050dd9577a826bc98c2666153be29053907cf819ca4e626811a04025be2236de108b6c1b351cddab164b6d83140aab23e0ea4 SHA512 5d7a535000ef5bdba15f06b4c2d6279a64f46d653d0897b53e4ca64960a5df8f0d2d59bfcbe3bd907b591a3bf98174dd411b65ce7544e534ec9f68207441f1fb
+EBUILD emacs-26.3-r1.ebuild 11938 BLAKE2B 4b2c7c2c56190a1f8c2fad59accbf0c6591359fd14848c2b45d18988cb65e8e53ecddb0ed3c747ac3f7292055169f323856bb1a74db5420119c129b7cb09d965 SHA512 fc61b50c30dc2079a21d98e26a1ece7d72454f2dfc5fbce27ea4f6dcf4e98913fe5a778ffb9165db89a90b847ca77111479110acc39b0b023ed5ff98f585071a
+EBUILD emacs-27.0.50_pre20191223.ebuild 12950 BLAKE2B ac2889155593fb3d756c2b89b254e322c61be2fff2b486f3717719f2f20b2a6803341fc98dd7d711894ce7b949fdb106c6ed23cb5cec68a54accef2d0feb033e SHA512 5b0f0a6d3d5afc0404b0f797512deb558cf83404b3818403656b7dea9e0aec9b28152d51f0caef6597d320224dbb949a75f62e5a48cd3418a91fc5015a846f26
+EBUILD emacs-27.0.9999-r1.ebuild 12952 BLAKE2B 1f4ccbb560c7d7443f1a81d97dfc737684c88ef949dd600bb4f2c2bbd6705e95b0817e960cbfd0e5bb4dbff40c9721c0016f37b7cdf2543565e85dcd85d2c3ce SHA512 43abb3d8d54e3bf6195812c23e93778d4a52004bd392c6a84121fb5e2a5dcb6d1be37869434798dd741dbe6a90748591dd7e0e758d871dc110b486c58602cd84
+EBUILD emacs-28.0.9999.ebuild 12901 BLAKE2B 9b22cbebc819fe3db86f567a9fc3f9644248309e48f3fe1864a3cfaea06fbd294b497c38a3223b5e836dcb8e24dadbf516e89ab4076000d86301c674b946c7d5 SHA512 12a6b32d06f027e0af7bd4b89e4968ca821089489069a27aa445e14405fce30b7e4b1fb95ad946333a6611d9449505bd10a68f73eec00815862030e07cdfcf03
 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 417a43038b3f..a1147d8de5eb 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.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
@@ -304,10 +304,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from a previous major version of Emacs, then
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index dacb99036a69..476cf016627b 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.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
@@ -299,10 +299,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index cbac44b0930c..d04301ce44dd 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.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
@@ -310,10 +310,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 4c3979f2bbc2..bbc32851d689 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -327,10 +327,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 7ec3305f06fb..6f44c2130188 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -336,10 +336,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
index 4bf595df19f0..004a1f105455 100644
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
@@ -366,10 +366,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
index 888936ba8cec..773badc6936a 100644
--- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
@@ -366,10 +366,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index c8fd88b4d30f..399e033ca046 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -363,10 +363,10 @@ src_install () {
 			"${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.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 46f247444fd4..65619419bc32 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -11,6 +11,6 @@ EBUILD gvim-8.1.1486.ebuild 10481 BLAKE2B bf3ea284ca7ec187e32c1cef705867fbbb9292
 EBUILD gvim-8.1.1846.ebuild 10556 BLAKE2B 7df798e79326c4bbf64be95fcae2f3ac4668dedc949211010cc6f82c69d2e85f6ae96089c063947bf424a33e2956bcbdaf044a43bbaa8375e5f5540c1daeb434 SHA512 acb4e88bd8fa52f8fc69eb038030f3d148ec916cbcdd812411b8bb58ed7a2801bdc32a04b7af057d925113c6353aade536cc1a5a8da138a1ffd0e54227bb4837
 EBUILD gvim-8.2.0055.ebuild 10556 BLAKE2B 66fd819bf91a53ef4535df4a63c0cc85b65c33d5d5db66219d5e895bddb5c7f2eea1fb2450456d549cfac2143d82fcd5bf1c2150cc39f4b91f60416fa367f2f4 SHA512 7e7693d91affa860adb941c25dad8583abbb5720d7fb2aa44919e9850cac8ef6b711dd138fb1799029f7f918164f4ebb175e4a9d461a5adcb234121f069dd62a
 EBUILD gvim-8.2.0114.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
-EBUILD gvim-8.2.0210.ebuild 10341 BLAKE2B 773ebd921b36898918496d422d66f141ef1bd4eb4a4ee7ecfa3bac66d3a6ac00ee4bd00e00bf677384c51fbcb00b1a003d50666cd95b7ced62d3f440544cdd89 SHA512 23b54753dfb84c19b024de2b6f6c34bbed88285fd0e4d24754c20739208bdf03c50c14f7c309e31094916b6cfb56ac84d0053fa83c1fffbcdba23570ee168f1c
-EBUILD gvim-9999.ebuild 10341 BLAKE2B 773ebd921b36898918496d422d66f141ef1bd4eb4a4ee7ecfa3bac66d3a6ac00ee4bd00e00bf677384c51fbcb00b1a003d50666cd95b7ced62d3f440544cdd89 SHA512 23b54753dfb84c19b024de2b6f6c34bbed88285fd0e4d24754c20739208bdf03c50c14f7c309e31094916b6cfb56ac84d0053fa83c1fffbcdba23570ee168f1c
+EBUILD gvim-8.2.0210-r1.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
+EBUILD gvim-9999.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0210.ebuild b/app-editors/gvim/gvim-8.2.0210-r1.ebuild
index d67c65f8ee9b..abe335c6f243 100644
--- a/app-editors/gvim/gvim-8.2.0210.ebuild
+++ b/app-editors/gvim/gvim-8.2.0210-r1.ebuild
@@ -199,7 +199,7 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
-		$(use_enable python python3interp dynamic)
+		$(use_enable python python3interp)
 		$(use_with python python3-command $(type -P $(eselect python show --python3)))
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index d67c65f8ee9b..abe335c6f243 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -199,7 +199,7 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
-		$(use_enable python python3interp dynamic)
+		$(use_enable python python3interp)
 		$(use_with python python3-command $(type -P $(eselect python show --python3)))
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index c93dde01e98d..d97e6e43945b 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,10 @@
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
 DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58 SHA512 76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
 DIST nano-4.7.tar.gz 2977920 BLAKE2B 8373ebf3f4e98ba204ed00678ba1e8791c9ffc11226baa98b7dac9ff9389cc465dc6574833ce222570301232a97f87e1b8d505dcce617f6c8bd915f4a662df4d SHA512 2cbe2341bba46f57a692d6deb20003d992da0230fdec3a2dc485d3b03d2ec2a70e66d05299bbc719fca658c8a8060dd64d4b52e68aadfd73980b82445761615f
+DIST nano-4.8.tar.gz 2995765 BLAKE2B 80acb19758c4bedfa1fa52ef9ede7125bdd3844df6932912899ba2f5c4471859ac6d044b2c67d43afcfc416d0b6bf0b5d023e79645c5d6207c5ed4a0857305a4 SHA512 3e6f8f2a7ce55df0eb2d96459a22f0a40808b4ffc67eb5a35937437f5c1cb193046b02d123597981066b872ffacf345bf0f4c72f546323324ebb66aa751d11f9
 EBUILD nano-4.2.ebuild 2168 BLAKE2B d6daebcddb29f779588ded756966e14efc827c68cd3eb5c7a7fb9e7c98159b9d6c286ee7456aa6bc16b5d3bdc167c7fd987ba6ef65a85d16dfd8c1d5d5c014a5 SHA512 21c1507c0a2430595eaf3031b1fd587c766ec162648f7eeb0d427aa5308ec4c5a74638bacc61e982763c212e15db20cc40bf3f64caf3ff61650dc374dccf5d74
 EBUILD nano-4.6.ebuild 2170 BLAKE2B 0f57307e8cb772be9e724eb03605465c41cca60e941a99ae7add2a31cfa1066d25b629721a25c7a3166d33bacba13965543c6ddc7c819945642ae451df93b8d1 SHA512 212eff2f9f01da5e094a378f5a46c968e853423049a93b4183ecb973926cd9394edb12f0bc2012d2c207b028377a4957d5d49ba1be45e3f106894c8e8b88e5ac
 EBUILD nano-4.7.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
+EBUILD nano-4.8.ebuild 2180 BLAKE2B c4c21a1b68f1b444bd37a83eedec29c16b0d41fc0861ea985e5c6f91d79de49a69ca5c9aae0826c9b8f82743dcb0721fa32df94b4a61f322d4ad4770f5e247b4 SHA512 22ee6cdf0d25af8c165c9c2241f1fd8eab261b830b169412ec75b629ce6bbb22a8b3b9a98f9c66d7a6de54a251c09ef00105402ff185747705cdeca179919f84
 EBUILD nano-9999.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.8.ebuild b/app-editors/nano/nano-4.8.ebuild
new file mode 100644
index 000000000000..399fdff323e8
--- /dev/null
+++ b/app-editors/nano/nano-4.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+		$(usex ncurses --without-slang $(use_with slang))
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 0f595caf0554..aad82dec126b 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -7,5 +7,5 @@ AUX nvi-1.81.6-printf-types.patch 437 BLAKE2B a7cf425c52882b693e928af13790df0959
 AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 BLAKE2B 2c764c05ba9e8745369441062452e6bcdf6c065d2c9a040d4ef0f3d2041ec31c574be18bca3432b3ac252c693e2feec4f7df9851055305bad9760fc33d7220ec SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196
 AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 BLAKE2B ffdef923f5355ab4839955865cce148c8713517d19c5c6cb8fc4dcff227c1c833bc120d505f36d81240d64d4a0472628c61a28456db1675ecc2d47c3323a1507 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906
 DIST nvi-1.81.6.tar.bz2 1758309 BLAKE2B 7aa9b1a7f5337bb246a4a8779180830efd2fb1cfeda2c0d5fc153393cd683237cdfc2a69ac22b228629561ae2222d4eb36746fae4dfb6b9ff44945265988929a SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd
-EBUILD nvi-1.81.6-r7.ebuild 2088 BLAKE2B 290dc6358a735f11fec193136308cf9fa3361b264c155d7427854b15be51da590220434c82fa5ad1c804c54c663995834be7d362a78546a1a340689dc41142ae SHA512 901b2ba1386317deab1df817eb3cc0ee755c3cc64d86a61f583eb22b3221168c5a3255934347a42e4d00ea76298e804ebb4c595224449c3f86e697bc677d21ec
+EBUILD nvi-1.81.6-r7.ebuild 2086 BLAKE2B d075f79d6cac356d5a4f2066656fef6c304600c17cfb3ff666a6b1449240bf25cbed826a5a3a6aaf84773afd1f0a5841f9a12226abeb0985785798e25f52322e SHA512 10deb05aaaab2501240a6ac213433d1da662a0f051febba3dff97cc4b344274eeeade7cd04fdb98403da0f664c6cb70e4ca03878687d4c4ee4070d2f7c1bb65e
 MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index dc52ca6e54cb..322ca70ae4fd 100644
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild
@@ -57,7 +57,7 @@ src_configure() {
 	use unicode && myconf="${myconf} --enable-widechar"
 	use tcl && myconf="${myconf} --enable-tclinterp"
 
-	append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX%/}/usr/share/vi/catalog/\\\"\""
+	append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX}/usr/share/vi/catalog/\\\"\""
 	append-cppflags -I"$(db_includedir)"
 
 	# Darwin doesn't have stropts.h, bug #619416
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index f3e32094f6f0..ce832c99a421 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 1615 BLAKE2B f127a9c44eb2b981fca0b9cbafbba7787b9c69b27f7a7a4524b129161bfe390d24365159a036663dfd7b97f4f9642cf6ed5a2f0bb5cb30b8e7e932c2aa86ecc4 SHA512 6d8424bbc0b30b4141d257f21ce1b40275145f152a3082a5920032f4a6869a883cc1e46f9c8dc0ab898b3971dbccebba728dfa01721a705a4402f48b5d7e922c
+EBUILD vis-0.5.ebuild 1613 BLAKE2B 2a8eb581451c657c5badc7c1342e7f61532172c9c49f9f9cf2a1d43a56721a601ea2db641cd8aebab3aac1fcfeb85e85763d39c0631886795836fb1a7518fa77 SHA512 c57717cfae7979952461f67dadac50e580e1ec5ad3fb3a16bf3630f562340b0c4e0b7d8978058cd4d7d213b692a22c3d3f01b401d3592c1f326626b3bb248b1e
 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 8e569226bead..0fde7f463dd1 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/vis-v${PV}.tar
 	test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )"
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ncurses selinux test tre"
 RESTRICT="!test? ( test )"