gentoo resync : 26.08.2021

16 files changed, 49 insertions, 48 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0933f08af4b4..d5dba555f74e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 26a750f84694..87cff76c5540 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,12 +17,12 @@ EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a
 EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c
 EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
 EBUILD emacs-25.3-r10.ebuild 11127 BLAKE2B d337f00dadd09db93bfe37fa0bd69318cd92395bfbe1edb88a4c9319b69b50067d2f008f1a9196e03c8ce99d520f5d0d8c6771775082383741c3e4401a4b5700 SHA512 757d7b8c68613e9a2e3283e2369aa31c38455ccf7e65da760bbc34f97f2e514f476762cf2d217cfbc7a3c7602e0fba62ac4c3a0c127427178bd822d0f69cac1c
-EBUILD emacs-25.3-r11.ebuild 11133 BLAKE2B f943c9da7788ce40b7d341e74c6000ef5bff7a8a50b589093c35c38eccf4ce342cdb89c3e316b3994c3b2dc91a0433300f7cc8918401e1713e1665336cc32a7f SHA512 90fc889d351a9f2a07f7589b0b59efa119735d7dee7fc252fa38c040c0805f2e657b9c2ecf8c1959acf6cc0e50ae049746498c6c33b84d4fb5d47f7d1ecfaffa
+EBUILD emacs-25.3-r11.ebuild 11127 BLAKE2B 22d66c1f674b929fe6b325e499c65f7134c88a129d256c2e1e505a1ec47d00342262975c6f1005cb7141ae21068cc3136eaff208441ba93a0676afd1eef5db06 SHA512 fdf225d4a0027f09971c3f3a176a74b1e9e88c79c2449cbbc32a31e6dc5bca9367e84021ccb382b8f4cc7133a7f0ef4266517c02c0dcaedba033cab7d94bb3e7
 EBUILD emacs-26.3-r5.ebuild 11739 BLAKE2B 4dbb06bd2883c8030414558c0f42cc0fa56cad2a9c1cf865ed69002825df5b4873fb697b5490ac183ab5f8398c5ccb2b9aaac0fc5b5eac00248ef2a960397044 SHA512 0447abdb36d3a97f9247ba545bb2c35d692740cdcb33e9e73af71d795b514bbaaf8ea35a806ee3f1df4a48b5b1bb6cac3e264b4e6ac06bb7b4616bee92b0ed09
-EBUILD emacs-26.3-r6.ebuild 11832 BLAKE2B b3b5b028975897a699103872f6ce3526132c32e0876cce5fab2a7401dc56406b96978c3a728aa6520c02a28facaf7b88ac721811f4b41b7152c485038d4e0a4a SHA512 bff00110d95455d80f978fa158ac87b907d7c3541c7cfdf6d2d45570b12b8c3e972478af93bdb8cd860d6976eca330e4b01de59c4849afe36d318ce7a250cf19
+EBUILD emacs-26.3-r6.ebuild 11826 BLAKE2B 71538046832f8f5a270f93da03955a956fe7c030357146dc3501e2f44e950a4be144f8373c914f68e8bab7d175fbbf5aeff9e1aa3684fb87b34d1934bc9f4830 SHA512 6353c7566f34ac16abc672ae12ef88e91d5668c8cb07f569c98b68889ba8db8a85bed3568917afc0fff1b3eaf42ea62fc36826e5f7b1a4c7e25375ed5c23caf1
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
 EBUILD emacs-27.2-r3.ebuild 14416 BLAKE2B 44040748fe6ce026c2f92c4122306bb800c7d91137c855675981039e8fa17d26a620f5620554fa37f31feadcdb2038b2636cfe0cac314440424db006074f5af7 SHA512 552db85e54deea9a8450754978e34ea882577a5efe9b8861b76bfd380b1e6e9ebf0e38a8a54ae06808026d3089cbcdbac8e08665c4133f5e853f48230a9dacd3
-EBUILD emacs-27.2-r4.ebuild 14423 BLAKE2B 5922774868e9bb3956bdc0ff9e7bdbb3ea35031cba5b24851351add13bbf5d3148dcdf2a8b5fe6f80449ebbec7d2ce8b6479d974c5a35a43285e0d1f4795ad32 SHA512 367f3566c27e509f42a534436fe1da1a605a1433400bfb2ceb28f6e617df482158b3d0e20d0c86463125aecde4ac21a19e009e4c5285b588ad64c643d4482d1b
+EBUILD emacs-27.2-r4.ebuild 14417 BLAKE2B 8c9be9c3daab3abec102becc463143f52d8ebf027d2009faa6dc86b4492f852db1349367f4d4f8a089c4e410546ee1ca3d2b1704cb54d878971eccd87c5e881d SHA512 be51c5ac64bd346f19c4df2b6d6b3f557e28c30cf1b6f7cae36af96ff94dae6ec6a513eb66cea34d0d1063e63a82d404c42edf240bdd22fd05e8b7f428c537d1
 EBUILD emacs-27.2.9999.ebuild 14283 BLAKE2B 12dbe5a161e22524bb4d02d0d659b62a8f1940a9a6382b898e6e23c268112f583938225b4f94c8ccbe2bf2e7b70356539a8623eea12e58ce5d2ee272fea16a20 SHA512 1e70761bb0b13dd24515f0e7e9e0e1676d80ff5bf7bd0138d8cc7518a8ae1b20907ba7b12c27b904ec871576a634ee265cd894a7c2e2235c7d7101c16b0f6dbb
 EBUILD emacs-28.0.9999.ebuild 14448 BLAKE2B 88fc7d442c04c87045b2715fe72845289acbaae4e5586965fb58353e48c30950090b6550e75781f9d1c3ffe135bf97d504409e7247ad933a0866bf4e53627901 SHA512 646f9df3bd50ced09b21d28b045c7bd88f6b7dfaf7c341100d4a7c8696de1235c7b410ae559378824a150896eb17b2d420fdaaa32552b3047e6d1de0a4231fa7
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-25.3-r11.ebuild
index 1b851ec31383..5d17753253ee 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild b/app-editors/emacs/emacs-26.3-r6.ebuild
index 7601f81ee0e2..a000cf096dcb 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui 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 Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild b/app-editors/emacs/emacs-27.2-r4.ebuild
index f1c41cc33a9b..ed16b4af7f7a 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 1c96675674e2..700a7698869a 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,5 +1,5 @@
-AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
-AUX kakoune-2020.01.16-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
-DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
-EBUILD kakoune-2020.01.16_p20200601-r1.ebuild 1050 BLAKE2B 384beddd1657e9bcc14e82ce2fb59121a2de1325a9a4f81929b9ac7680bc88e4b471b339f64179a305a4a9da616c4a5f754b5e2df24de93ddf8069772fdb6d33 SHA512 de19599681da7055ae22699bf9305cc8916d853160d949ddc7ebc30581e94d27c3f2e1324457dd0baae51a31f5f3d7fe8716734f420119696d94f7a1b7e44c73
-MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
+AUX kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch 282 BLAKE2B e7a8e8e79fc81b42ac5cfc987684a38d8b73a3cabf7ccf3b35324f0cc49d2176a7aae4daefff46957cf3407a0c50544ae838d07f04b650cf2e2947fa3523ec59 SHA512 245138d130e32ca61dfdc5325362dae67113a73642f82356ef3a0d33367361e51011a8cac5c9bfc134c5aa2dd6461a0a9bc98ff54921a3763e8752d8f1fb4921
+AUX kakoune-2020.09.01-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
+DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126
+EBUILD kakoune-2020.09.01.ebuild 955 BLAKE2B e9e68960e0825839f40a167aa5604dca9e66ad6280935fdaab1495d0ecebdc0e96ed9cf44f0d47f2e9aecfffa19d72cda9b9aa4abb4917478760a0ebaf9258cf SHA512 bd8e52b290f30dc8e9972b27499c2b128b1e020347512598585221d4ce2877ff63362ecda440a9f0357b7fec6cdc9d8bf0f5dd41d5499b0bd3d1ff225e04fd19
+MISC metadata.xml 511 BLAKE2B 5ec5bbd3388e02601c560810a04e95e02f2d03f53e0539e98123ac3736849d49867301ebf02686ccf7c5e00b09800f6e8503792c63ffb0170ca0c7eaaffafec3 SHA512 20224a1e244a69b7d2536393b4d8f131bd97450a4223d530033b0e6391752ff0856a5929ba33c6466ee4f581c569afe11fdee1e2474f94ef18aea96675baa773
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index 726968e0e8c6..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
---- a/rc/filetype/sh.kak	2020-01-16 11:52:20.000000000 +0200
-+++ b/rc/filetype/sh.kak	2020-05-25 15:50:20.417809942 +0300
-@@ -2,6 +2,11 @@
-     set-option buffer filetype sh
- }
- 
-+hook global BufCreate .*\.ebuild %{
-+    set-option buffer filetype sh
-+}
-+
-+
- hook global WinSetOption filetype=sh %{
-     require-module sh
-     set-option window static_words %opt{sh_static_words}
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
new file mode 100644
index 000000000000..d7b9083a4281
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
@@ -0,0 +1,10 @@
+diff --git a/rc/filetype/gentoo-linux.kak b/rc/filetype/gentoo-linux.kak
+new file mode 100644
+index 00000000..251dad16
+--- /dev/null
++++ b/rc/filetype/gentoo-linux.kak
+@@ -0,0 +1,4 @@
++# portage ebuild file
++hook global BufCreate .*\.ebuild %{
++    set-option buffer filetype sh
++}
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
index d558c49347c1..d558c49347c1 100644
--- a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild b/app-editors/kakoune/kakoune-2020.09.01.ebuild
index 21dafc2dd2c7..bf078a51afe2 100644
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
+++ b/app-editors/kakoune/kakoune-2020.09.01.ebuild
@@ -1,15 +1,13 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
 DESCRIPTION="Modal editor inspired by vim"
 HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
+SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -20,8 +18,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
-	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+	"${FILESDIR}"/${PN}-2020.09.01-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.09.01-gcc-11.patch
 )
 
 src_prepare() {
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
index 9469b5728eda..0de50c33abc4 100644
--- a/app-editors/kakoune/metadata.xml
+++ b/app-editors/kakoune/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mawww/kakoune</remote-id>
-	</upstream>
+    <maintainer type="person" proxied="yes">
+        <email>mujo@sdf.org</email>
+        <name>Ian Hixson</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mawww/kakoune</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index f9ef4b937b0f..069902d26213 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
-DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
 DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
-EBUILD mg-20200723.ebuild 1039 BLAKE2B eef7dd1ed4645c2cd557e702673fb57076beb717e4230147431d98d719d684415f83f90bce40b1a9c433c3084b4278740753c704dad7ce8a98ac768cb9e09157 SHA512 2ef7301ccbb7ef1d067759ff9932584864ca36a62ba1ce66ffbf35c2d6118040d77f42d6947a55c86d62251191dbe29d272a6d54e6c36a9632a37f197e246bad
-EBUILD mg-20210314.ebuild 1046 BLAKE2B 5e41a6ada17349e0e591515e07909377c9cf34d31f72f9a08464c602d8065fec45e76b7f1aaf5cc9369be506224ba78f9ba1875ecf0d6fe9bad73c110f4b3f80 SHA512 6bbfef8e6109423ac791a8b8cab55da587551a015b1e12fee2d1fb9a4656c4d23ce4ac982d95bb7003a287ec259a7745fa97f8b830320fda0cc8ec51c60949c3
+DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
+EBUILD mg-20210314-r1.ebuild 1047 BLAKE2B 58927b004dd4d86b0b265c81c4143c3f5c89f40d68c8f97af75696885c2cfa1aa2a6d4e1f72507b30a424466e7da47ac88b66d9d0d17652f8e47f9cbf791122c SHA512 77ccf850b2e25689630b8b04a3bd075f8dd1c2852a4a5a64a18b846443ca4822045986e4798bc21a45512d8ba456b4ced44a0af6a6a047a117a0133c4a06f90b
+EBUILD mg-20210609-r1.ebuild 1092 BLAKE2B c3f50c0360e6ea2b316beb43d58d1b619f17643a2bdf8d7e538aa0768e288390e44d73bd700fa20d6e58f2f479b10956e7c0a628a3ab20ace7effda5e7bda234 SHA512 dcf36883fc1f35c363fc5525b96bfb87a1cda086b5da68f48e63d788260295cb9d4058f786f1203f87e1a6fbc72c4b9110546b27cac0459eccdafc72cc972220
 MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/mg-20210314.ebuild b/app-editors/mg/mg-20210314-r1.ebuild
index 10f44d583185..59dc39a0a994 100644
--- a/app-editors/mg/mg-20210314.ebuild
+++ b/app-editors/mg/mg-20210314-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-editors/mg/mg-20200723.ebuild b/app-editors/mg/mg-20210609-r1.ebuild
index a25f7051f9bf..8bc287431abc 100644
--- a/app-editors/mg/mg-20200723.ebuild
+++ b/app-editors/mg/mg-20210609-r1.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
+HOMEPAGE="https://homepage.boetes.org/software/mg/
+	https://github.com/hboetes/mg"
 SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="livecd"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	# fix path to tutorial in man page
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index ff283ee93966..5623ac2ec159 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -17,5 +17,5 @@ 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-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
-EBUILD xemacs-21.5.34-r6.ebuild 7313 BLAKE2B 11dd52a16988b977ed372d0369e7b958248e2ead1926393170b9a4f58ca9062abe9d9e55963942cf53731dceb3c685b6936d46ed2d87e450614b9bcb050fdd9e SHA512 e9ef30136edec568b2c20067c1f6d5f991fea673f01f0dd04b9a7d69cf240c5a8535e7a5a7688716240ce5d4fe2472e44697a62ef4b230feff4011416bf0879c
+EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
index 7e8c4188da85..b1ec1ecf51e1 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
 IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"