gentoo resync : 14.12.2020

42 files changed, 553 insertions, 77 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index cbafba2ae183..bf64d9b16403 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index aff840aff492..579c7b038c02 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,4 +1,6 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
+DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
 EBUILD bluefish-2.2.10.ebuild 2556 BLAKE2B 910fea9618911f35362e3162fb4c16e1eea08c954898500bf30256b49c194513aef6185b506d91fa1996b795d9dbfc96a4b14411ab677c364c4bf3bf176a6598 SHA512 e84bd7bc879ec41696fceb944a525d8d6b7ffbe0a339f1c6da3c20cd96bbfa551a832800095d794a4c0837aeeb359371db6d7698de01130459be375dd855eb04
+EBUILD bluefish-2.2.12.ebuild 2621 BLAKE2B b966f08b414d5ff14b122bfb523148eac36a2fd013a4a410d36b732c3b1f432e00d6b03774b2e40036faaff94154495d813dccf52a9012eb43274d5e9d608651 SHA512 50b04c1ed5b327949ab31fe2663ecc57d6f01fd2ab766086169466f0a49f25a25f07ae2584d060442485ba60f00939937feba59454fd469b0c6da5da506bf137
 MISC metadata.xml 386 BLAKE2B d8663af89654394ea695c309c2ebbf2d3beba02463b2e57a0f91d7699af0e6457fa0ef0aa238f76359d3531bf4831475978fdd8ab4eb943dccc295e294b2eb4d SHA512 589c6c5db0ad2b93d2b44284faa19845b48e790252ecf5983fb3ba2c2b749894a382eea6dffe053413c0b29b86063a8906b88ae6f165b1cc9fc79742ae2fc188
diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild
new file mode 100644
index 000000000000..9b1dfeae212d
--- /dev/null
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools python-single-r1 xdg
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
+HOMEPAGE="http://bluefish.openoffice.nl/"
+SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="+gtk3 gucharmap nls python spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/zlib
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? (
+		x11-libs/gtk+:3
+		gucharmap? ( gnome-extra/gucharmap:2.90 )
+	)
+	python? ( ${PYTHON_DEPS} )
+	spell? ( >=app-text/enchant-1.4:0 )"
+DEPEND="${RDEPEND}
+	x11-libs/pango"
+BDEPEND=">=dev-libs/glib-2.24:2
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		dev-util/intltool
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# there actually is just some broken manpage checkup -> not bother
+RESTRICT="test"
+
+pkg_setup() {
+	if ! use gtk3 && use gucharmap ; then
+		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
+		ewarn "Disabling charmap plugin."
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
+)
+
+# eautoreconf seems to no longer kill translation files.
+src_prepare() {
+	default
+	eautoreconf
+	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
+}
+
+src_configure() {
+	econf \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
+		$(use_with !gtk3 gtk2) \
+		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
+		$(use_enable nls) \
+		$(use_enable spell spell-check) \
+		$(use_enable python)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	einfo "Adding XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to add XML catalog entries."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	einfo "Removing XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--del 'Bluefish/DTD/Bflang' \
+		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+		--del 'http://bluefish.openoffice.nl/DTD' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to remove XML catalog entries."
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 0271fc075a1b..0c99d45370ff 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -5,5 +5,5 @@ AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac33
 DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
 DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
 EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3
-EBUILD gedit-3.36.2.ebuild 2447 BLAKE2B 438318fb6c67658fbebc9d88175fe33b02265abb4eeecdd2ae4dd041332ea0f2322f2a8ec066498c8f5ae444da31d752710c5ceb3bd4178558b3602a862f8b4d SHA512 751f6ceb54780fd924219fdcd41514af0cde321928f5c0d3d322a30d3e29dc7464ff9a0ba9716f98fbb3f7213fee6c162a14d475d03d31f8c7eaf950d5352b7a
+EBUILD gedit-3.36.2.ebuild 2454 BLAKE2B af8b8e2fa943c9a80d8ffa9d42a8d620207d6f170e187177815f7a037bc0cada8ebff990789b7af786c306ae87ea329e86f9ce6742c681736882c7cdcac24355 SHA512 274a54a606648b3604b78a99e9a932794236c68f1c14916636807da4d1eca42813e477742e4f377354267f3036d0434a66b6b5c250d8d494b6e98e131fc6b267
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-3.36.2.ebuild
index 41d504dc337b..3b78f351f474 100644
--- a/app-editors/gedit/gedit-3.36.2.ebuild
+++ b/app-editors/gedit/gedit-3.36.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # X libs are not needed for OSX (aqua)
 DEPEND="
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index d4271f67630e..848a7317fe1a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -8,7 +8,7 @@ DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 EBUILD gvim-8.2.0360.ebuild 10326 BLAKE2B 4fd00bb56f9cac3143d22d7d080046a4ac76a8d64b13ede6614527aa5c69603b792f5b0ec5efb9284978a1c782454211bf23ed25fb96e6994352602bc97b350e SHA512 37b60dcc8805c6aef6e1b1a3bb93fa96ad6b12a66614f30858018f369843d77ab57040656b710fd818bc2c823a43202ce52dff5a6aff1e1912298a72e51ea2cd
 EBUILD gvim-8.2.0508.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
-EBUILD gvim-8.2.0638.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
+EBUILD gvim-8.2.0638.ebuild 10358 BLAKE2B fcb31925fe4f4bb0c988efe79b2125b1ec8ff0b73d09dbcf8c555ae438dbb7c00b8715bfe3f8327a1ceb11a9642978c6908d3f6ef33563ee9c709a75f139ecb9 SHA512 08644cdbcf7dfa5947a26e6e98de7d71a18f098ba5e365511e9c76cc6b8effd71f2b0655ce6af9350f81fd224d63b3122ea17dff7ec12e0cb88bea56183fe031
 EBUILD gvim-8.2.0814.ebuild 10320 BLAKE2B f0cc97277892726264f6db574fe900c9bf67d5b2129cb15a509dd8848a0c8f9310975430a53fa1bffe62d6d94df53603e54194eaa7a1eb17edc78be22e343129 SHA512 dc45775945bcc40913afd9d0bbac3eb6ab5c789dd7621736f4202aa1ae7446083132db353120ba6d781ec63620b33c98cb31a4f390dfadcfae32f53bdc1acca0
 EBUILD gvim-9999.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0638.ebuild b/app-editors/gvim/gvim-8.2.0638.ebuild
index 3542682bc039..1e52d07ddb49 100644
--- a/app-editors/gvim/gvim-8.2.0638.ebuild
+++ b/app-editors/gvim/gvim-8.2.0638.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index c45b7d9f3bf1..0c56eaeb8568 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -1,9 +1,10 @@
 AUX 1.55-gcc.patch 261 BLAKE2B 323f9408222a994b0571b1a154fc0117f9b1015f2592b35d98156fa783d26f4e1377d23b1820e280e5b8ce885e826fa00f9ce51b9400c0ebac4186aa2b0af0ce SHA512 ff9612dcc75e2e0aeb67c5170c97e2705a1447ffeade77457924f5b7c354b4f7a69f53c237d1674c39fab5c057c27b5b7fa3e0779ce2f19e0a128f0b0228023b
 AUX 1.55-tinfo.patch 339 BLAKE2B 9860fe0cead822ee4773b6500e53cc10366527fd2e9068ea29561e1b3c695719f210f860f840b65888ecfaccb6b4e4d5a9af5d0328652d948a53104609df547d SHA512 267841535437a1e71ae94fbfbfa7e2250cba919ee8a1c7a19f861d667f9b4e2032ed1cc6ed5b6b6ad7093aa62425d16f99a56d7a3e0737a4dd9f87bf7564f5e1
 AUX hexcurse-1.60.0-Werror.patch 291 BLAKE2B ce310d08d4880d53c2eb3c17794294cc124fffcbd991d00471a00fd796ed1bd4f1a1317e8a8690f5cd94abd0ede9b317f38cf2ee20ca1f5bffe60acdf89b7571 SHA512 01d6a272b2fd0bd033e4157f2fd2c13e1a8ec6148534217f0d38fbac04ac402b0be919abddffba519afb4bec16dba951a9bdd998cf21aa4fcf8b81b0d6d2b6ff
+AUX hexcurse-1.60.0-gcc10.patch 1095 BLAKE2B 399cbef6c1136626f83851a23e82dd180cc4f92d121e5c6563da0048a934947f2a96a3a3dbefbe0230ab8dac3aefea1dfa19a946b9f21a1feab5d033e2f1d0c4 SHA512 8b1e4cfaaa53f00e140bdce4fb3ee9c728c8f362689f2f85aab0ba537532475e1016cfc7c2bf36a3bd53a44b532cf3e257203d73a7aaab38d6a5ad79a5c9f974
 AUX hexcurse-1.60.0-tinfo.patch 386 BLAKE2B e4f376cc9cf60c9163553aa9082e5c84a228f0704c575941414cde6527cb6c9b867d55cba45dbb35bdd95d79ee8d13acee3a139256d794f9f648af87581ed458 SHA512 ce0c25842a874d631d75826f6b967fe0d0f53a435e6222eed1310caa884b570c1cf131c14e0be84fc7de728e37cdaee5b950ada527fd03ddba0dacf578e4fe42
 DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174ca3cc7d29232c6d2a2f909339a0555ff459ed373e62e35b3d1d8abfbbd32a9462006b20bfa1f4f641f4eba825 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7
 DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
 EBUILD hexcurse-1.55.ebuild 667 BLAKE2B 3e6fbad3a1f63fee93d6b0e95f3fca1b169f4f47ec4a24ce8ccefbad01a1f88a159ff3b8b412a77fe19761fbca3a92649382e6dba3adacf94b200f4cc22a8814 SHA512 46c9e32f704a557cc6d8445b711aa22da954201a894ee8d71f7d6aace738a41c1939df969595043ca62a75375c8fc2fcb3172c7b284f42a6906aa5f07ed780dc
-EBUILD hexcurse-1.60.0.ebuild 706 BLAKE2B dc3b15be8fd7f967c25624ff29ea7ddd29e6dd787d427d6ac3ea0cebb73e1d89db13c05d91170f12af24dcd755de295f02942b852f340f8c40788b3f1bc1feb8 SHA512 6c69ea5924d248d9c4bcaf6a801377ee070bc759702568cf98ffcb4b03dd907f6b9a633cf7cd380d5a69f2fb823068d3efcc002b5e1c624feddb678b39dc4e22
+EBUILD hexcurse-1.60.0.ebuild 655 BLAKE2B d5f139a4a1c8646ba71be250bc46093ebd65805d1408b28d96f8cc04a3087eb04639862f11b651843ba5e3aa57a943d478c94a4833d2c6e10c007cf9e28e12f6 SHA512 b0b26bb38e2fc197226e9926e9028066119cfe13579bf29bab123c6a687cacacccfe343f6fd0ca45bb71c95e0ca5eeb44ee712db663c8bda08664114456dd845
 MISC metadata.xml 341 BLAKE2B f4e87e5d95358a8f4078d0e6940f7d6b3f7f68f6ba7b5ecd4b2d28b3a55528e0ab70787c5768b9b6fe27e293a3225c87a147d163eab3d3798d4f6e14d2c54f67 SHA512 9dae98987744bc9a84ac94d729dbd6e1147abc81bde05cfc784ce039b34c75f6c22d1da88b25cee28594ffb5286a65cf38331c30b45af2bba5dec61580260ec6
diff --git a/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch
new file mode 100644
index 000000000000..dfd8f4c2c557
--- /dev/null
+++ b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch
@@ -0,0 +1,41 @@
+From 9cf7c9dcd012656df949d06f2986b57db3a72bdc Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 9 Jun 2020 01:25:04 +0300
+Subject: [PATCH] Fix compilation with GCC 10
+
+Fixed compilation with -fno-common, which enabled in GCC 10 by default.
+See https://bugs.gentoo.org/706762.
+---
+ include/hex.h  | 2 +-
+ src/hexcurse.c | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/hex.h b/include/hex.h
+index 57845c0..845bac0 100644
+--- a/include/hex.h
++++ b/include/hex.h
+@@ -126,7 +126,7 @@ extern bool color_enabled;
+ #define max(a,b) ((a) >(b) ? (a) : (b))
+ #endif
+ 
+-FILE *fpIN;		        		/* global file ptr           */
++extern FILE *fpIN;	        		/* global file ptr           */
+ 
+ /* function prototypes */
+ 
+diff --git a/src/hexcurse.c b/src/hexcurse.c
+index e723ddc..3c167b6 100644
+--- a/src/hexcurse.c
++++ b/src/hexcurse.c
+@@ -27,6 +27,8 @@
+ /*#define DEBUG_LLIST*/
+ /*#define DEBUG_GOTO*/
+ 
++FILE *fpIN;
++
+ int     BASE, MAXY, resize = 0;
+ int     MIN_ADDR_LENGTH;
+ hexList *head;						/* linked list struct */
+-- 
+2.26.2
+
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
index 95d897125147..3512038ef7e8 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="ncurses based hex editor"
@@ -12,23 +13,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-RDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-"
-DEPEND="
-	${RDEPEND}
-"
+RDEPEND=">=sys-libs/ncurses-5.2:0="
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.60.0-Werror.patch
-	"${FILESDIR}"/${PN}-1.60.0-tinfo.patch
+	"${FILESDIR}"/${P}-Werror.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-gcc10.patch
 )
 
 src_prepare() {
 	default
+	rm README.Irix || die
 	eautoreconf
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 7795d89c9468..37063e607db8 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,7 @@
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
 DIST mousepad-0.4.90.tar.bz2 808320 BLAKE2B 5a639001663d24a9d0ae126f672adb5d3a72825893e0f0d90e263596f214d76f973e0743248efee8562dc04afb09c0519ed649ca5d36b9221569490e289d687f SHA512 e839584782b09ee9d485ca4dcf05e22afb459cba269b3a15fe2dc0e3f3240bc15b1a8d7db92160b735d97d7293e67b0484b50ac3e72946b499dc65ac1097390b
+DIST mousepad-0.5.0.tar.bz2 810533 BLAKE2B c98fe38d65923fca2a5f2a769ad8fd0c92f77c6aff2c658e2ecd3bc3081988cb10b5dd49ba36020fe05c6f172e08f6efb825eb2c38b630dbcc6fd4d639313e15 SHA512 06cab143a3a0f98ad2aeecb0c7f034b8dede355de09632217da27dfb0675909c6cb284b227644c9ab3513a67fb23594ee63f0112ade69830d46559a8e7d65842
 EBUILD mousepad-0.4.2.ebuild 1147 BLAKE2B 05c61f59b02d3fa600143f96e3135e4f0d4e3b7b2bb22e83005120c095477018dac9fac4d6895a7e01ff06a24edcf40862236ba3202898637446239b8e79c5e1 SHA512 91532dc7048428097cfccfa7b0444ef39a00cdd859842ec01d20029bd5fcab4e8baf3eea0993b0a7f29acb8fd00c40f7c57a9db7d69ba619c0c41a28f10b83fb
 EBUILD mousepad-0.4.90.ebuild 794 BLAKE2B b605fdbc5f0162763ea0944a55550221eeaa53c5886db3ff7528bba3e6314c37db6dd0e3c28ece1bebc19cb825bdcc559dcec8007e4043d93066a8ba0d3a11e9 SHA512 e48fad969fb5742577a300bba23fd9b3bb6651e8b722d819faeb2fd185e9e1b87807ce137dff26c97752db86ef2c7a68fa41a17abd9a7490a65bbc6b97c4c6ee
+EBUILD mousepad-0.5.0.ebuild 794 BLAKE2B b605fdbc5f0162763ea0944a55550221eeaa53c5886db3ff7528bba3e6314c37db6dd0e3c28ece1bebc19cb825bdcc559dcec8007e4043d93066a8ba0d3a11e9 SHA512 e48fad969fb5742577a300bba23fd9b3bb6651e8b722d819faeb2fd185e9e1b87807ce137dff26c97752db86ef2c7a68fa41a17abd9a7490a65bbc6b97c4c6ee
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.5.0.ebuild b/app-editors/mousepad/mousepad-0.5.0.ebuild
new file mode 100644
index 000000000000..8d5d963fcc26
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.45.8:2=
+	>=xfce-base/xfconf-4.12:=
+	>=x11-libs/gtk+-3.20:3=
+	x11-libs/gtksourceview:3.0="
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index bb72c94e20b1..d7356c06469d 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,10 +1,10 @@
 AUX nano-4.9.3-disable-speller_build_fix.patch 10305 BLAKE2B 1a319fa63eadfa8c98b2f3f35df3cae631253606f6ac38fce96049a1078f13b5885dc368d725d09bbf7cd840c0766d446f757282693526f9fb723b05d1d6c4f4 SHA512 ceef1ba4ce7fc296785cd579bc645d9565d16b9adffbb6871684421823addbef87a70bfcd8f3f87bc7e48477ee0c56d3b326aaa9c019e0d04a7f000bc46076c2
 AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea070e66ea445c47259d48960cb96a7a4b63cf5b4ff2a8f0254573a57b78d194354af2a3d8b4ddb43a1af9f31a6fa12ea8628f1a SHA512 a4a1ddb4c1f1999251d499f8068ddc0e743e4499a1bf3781095c604ac08a1700f8648d30441c5aa6a2e96d75df262c77dec7f64bc29faa3b87ba8b664227614a
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
-DIST nano-5.2.tar.gz 2865091 BLAKE2B 3822b3fd8dede897d698401a06ea0b4b49bf39f48d16c750e273007b1795a8adfc71654eadc08039a5c6999973ff7e70148b4c720b32a8f361424404e3c2ff3f SHA512 4c77bcfdf704a7882e944cb6d4cd571b698447500255e5701d30990def56cec0c396a33c761b8149f3cc4208a8dcd0f39372804d54cbe6bc2db9244f4a2259b3
 DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
+DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
 EBUILD nano-4.9.3.ebuild 2334 BLAKE2B a46bb4bc1a3cb5d62c0f7db03c7ad1785d168daae307275b198e7f4527d98d84c7b7557ee1cfe2f70e4aa5e60f8cda4abb5fd8261decdcd4f7ff11f54f25e686 SHA512 a8dab8ae77a332ca5576b907e8a73fd288f3da0f8fdd4c2d52ab4e747c911c30425b81db7958a6b3a256ce4b1a2d6a480a728991e67b66d6d09434f36aaad1ef
-EBUILD nano-5.2.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
-EBUILD nano-5.3-r1.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
+EBUILD nano-5.3-r1.ebuild 2448 BLAKE2B dd73412350ac462c24a68e3a980eeac058b1825fa24da42af21f35cb0f2dab33f7d536109628feeb12b6cca08670469260c5d2e7d0b6188dbfa6c20d46bcc53d SHA512 ecedf5bd813403b285c9994f86f5bc49cdae932d6ef1d27e96e5fd329c4f312c373c1f6344fd834401cc768e6d8fdf864787ca8653d5bbec589563d0d4ebd40a
+EBUILD nano-5.4.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
 EBUILD nano-9999.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index 58e6b0821478..25cf3962ed7e 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.2.ebuild b/app-editors/nano/nano-5.4.ebuild
index 86f22534c12f..58e6b0821478 100644
--- a/app-editors/nano/nano-5.2.ebuild
+++ b/app-editors/nano/nano-5.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
+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(+)]
@@ -33,7 +33,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+REQUIRED_USE="
+	!ncurses? ( slang? ( minimal ) )
+	magic? ( !minimal )
+"
 
 src_prepare() {
 	default
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 91afaca295a3..01db5fae6627 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,8 +1,11 @@
 AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4
+AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
+AUX neovim-0.4.4-cmake_multiimpl_luv.patch 286 BLAKE2B 9aba9e874a86c25d784f7ce0a8e4511e6dc7b5ad044ee9d06aebb7fd71230a8075d6aaad8e0bd9dbea7b6ad3a9b79abb48bfa16700e1320b97d78bbf49345064 SHA512 007d5b037d464dbfee727b51d889db8861e10672f2d1d736af131c81029bb1abdb279df4c17b7a32d34aa6caeba65fd2a97ab43c2c6dc651efed8f0e8d0f213f
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
-EBUILD neovim-0.4.3.ebuild 1895 BLAKE2B ceb2d111b6d52d10592ab2da6dd507ac5050420b56443a57356d18e5220a081204d5a0331ce788187bb2494ad8f68cae95fc24e36eb57bdf7a892ab93e64d195 SHA512 074b04fa5ae321a293382f1ba21677374352788cb2b166fea99dd9369d07a3af62ded6b7b6f9bb735d9573d95e2bf870d15c9a4acaaba750fe3c1f37f8d99c6a
-EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 58b011421a7cae8fd3c09d214a4bba0acd3eda43d5a08353170bc3c7268da080ae6fd8f891b36be77cadc1430506282e13d3e50dd4d6119014c0d1b43265f6ef SHA512 8106a227003985d3c35eca795abf2b587cd8e27b115e2e50c064a45e406605c6fa21eaee35eb85e3de5422ddd91a62745f6907f6b92904788c3c24b742890955
-EBUILD neovim-9999.ebuild 2372 BLAKE2B eefb333a5041d8bd4cc131c92aad6292a3928ecccb6c1afae5ac67608697085016af5c7928944d877a73fc26fdce5ac2fe14cbde397611a3e7e8b94f6e728a99 SHA512 109c49c8b12258d7e4cb7cde1b4ece99c8fb0faf362fab0df719609f9693c250241f30cf54764a7406ad6f5df2f0c471a13332447f6a6b1ee2659a52eaf535f3
+EBUILD neovim-0.4.3.ebuild 1896 BLAKE2B ba5466ec3e33e1e13da42edaf4c13003f62ca0ccb7495d1e76cd716c28619444bfe4c6fa61f49aef1982296553e04c504c33cb93ff7366702728438768ca9853 SHA512 c6d6ec282f937beab1171f57bcf55a3efb97f8d0676a57c43a477f44586c2ee7fa9c59967fee332ddb3164ba754be5f26af9be2f249a31968fada653235432d1
+EBUILD neovim-0.4.4-r100.ebuild 2726 BLAKE2B 162e67550f15f0e5ca5d161c4d0b8cc67dc0889c20d83d1beaa0675b2523262a5d4e597ac2099e6584b3d9876934c95e5ac99a3ac9a1b63d6b878d33ae37c720 SHA512 98a0bc6486c5bf9d82baaf49e2a5844c59e7d480a7541f133e121470e6d998fb4d0b3d7168fed53bf7ec28ce3fbf2b11756e1ca0742e518d09a10b7874fbafea
+EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 449d78658d067df46ec85097b9730653e45e7def1cfefbe3a8967c4bbd3864b3db37c348f66382baff8788a1f5e76083fcc27327794bf78a14db565874f86c00 SHA512 58c9992a9621ee2932f440a9b18c67ca9982338c164c95d4cb16274cd4f42dc91c6d5bf1aa9bf6178d2ff7a5ace75ba168635638e1b44d1add0607ac16eb5dc5
+EBUILD neovim-9999.ebuild 2774 BLAKE2B 33139cd79cec2f8ef864d3b779bbb84a859065d471a56520f9f6e40be625a2902079c445693336ef0d2edfd68f185f3d9261ebe065d695dab143800d93c1f25c SHA512 4873649e3c097077e949f66099704692209ff725c7408b1242f14584f0abdccc7af08285740ec6d3eb050f7185f032979c5b69e74756058f3d99bac7d2755d61
 MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
new file mode 100644
index 000000000000..4703dee52613
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -384,7 +384,7 @@
+ option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
+ 
+ if(PREFER_LUA)
+-  find_package(Lua 5.1 REQUIRED)
++  find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
+   set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+   set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES})
+   # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped.
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch
new file mode 100644
index 000000000000..62c6a84eae13
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch
@@ -0,0 +1,11 @@
+--- a/cmake/FindLibLUV.cmake
++++ b/cmake/FindLibLUV.cmake
+@@ -6,7 +6,7 @@
+ 
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+-  pkg_check_modules(PC_LIBLUV QUIET luv)
++  pkg_check_modules(PC_LIBLUV QUIET "libluv-${LUA_PRG}")
+ endif()
+ 
+ set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER})
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index b6a404f65c14..55644dda6a6f 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	net-libs/libnsl
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-lua/LuaBitOp
 	)
 	tui? (
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild
new file mode 100644
index 000000000000..c5a0f1bf7baf
--- /dev/null
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	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 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+#REQUIRED_USE="test? ( lua_single_target_luajit )"
+#RESTRICT="!test? ( test )"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# TODO: add tests, dev-lua/busted has now got luajit support.
+# bug #584694
+DEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/luv[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	dev-libs/libuv:0=
+	>=dev-libs/libvterm-0.1.2
+	dev-libs/msgpack:0=
+	net-libs/libnsl
+	tui? (
+		dev-libs/libtermkey
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch
+)
+
+src_prepare() {
+	# use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
index d10522f3c6b7..4bb6be68f96e 100644
--- a/app-editors/neovim/neovim-0.4.4.ebuild
+++ b/app-editors/neovim/neovim-0.4.4.ebuild
@@ -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 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -42,7 +42,7 @@ DEPEND="
 	net-libs/libnsl
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-lua/LuaBitOp
 	)
 	tui? (
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index ae758e6e27bd..38e9b6a6c5bc 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake optfeature xdg
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -18,34 +20,38 @@ fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+lto +luajit +nvimpager +tui"
+IUSE="+lto +nvimpager +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 # Upstream say the test library needs LuaJIT
 # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-#REQUIRED_USE="test? ( luajit )"
+#REQUIRED_USE="test? ( lua_single_target_luajit )"
 #RESTRICT="!test? ( test )"
 
-BDEPEND="
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
 	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl
 	virtual/pkgconfig
 "
-# Once dev-lua/busted has luajit support, we can add tests.
+# TODO: add tests, dev-lua/busted has now got luajit support.
 # bug #584694
-DEPEND="
+DEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/luv[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
 	dev-libs/libutf8proc:=
 	dev-libs/libuv:0=
 	>=dev-libs/libvterm-0.1.2
 	dev-libs/msgpack:0=
-	dev-lua/lpeg[luajit=]
-	dev-lua/luv[luajit=]
-	dev-lua/mpack[luajit=]
+	dev-libs/tree-sitter:=
 	net-libs/libnsl
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
 	tui? (
 		dev-libs/libtermkey
 		>=dev-libs/unibilium-2.0.0:0=
@@ -56,6 +62,11 @@ RDEPEND="
 	app-eselect/eselect-vi
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch
+)
+
 src_prepare() {
 	# use our system vim dir
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
@@ -73,7 +84,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_LTO=$(usex lto)
 		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex luajit no yes)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
 	)
 	cmake_src_configure
 }
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 912b4205f7cc..75f7e5aac574 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
 DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
 EBUILD pluma-1.24.0.ebuild 1780 BLAKE2B d845bbd202c228b0b8f11c1a74b6791081fabe9fdfe80e08e4e62b40e3e3e27b626caa9263f906b7c4eb9ad056412b0f18305a4a107d85ec14d7a39149d73e77 SHA512 1f81f212c6ad19b923e4f8a8aa5b935bb4ca05bba3059553583ecb178bc65bc562e939f690033d62e4737ba76e0d5b008076649dbabb06e87f632120fdfaabe2
-EBUILD pluma-1.24.1.ebuild 1786 BLAKE2B b857ee4a4f1d10b7867958238bcd8cf96cd1ad8cb2f710b9da51c01f1d175bc8dd98c41d82b05fc417f4af7fef597abfba30df96dd123358b08f8ef1c6e21b2f SHA512 96e61cac21d4f94b3efbea4c502e86a3b7c408b54bc79559acfdf599f4eebf6793413df33cf036770593c8bdf5a5390b5ae5bf8220c4cab8a9bd1e1e2d5fc39d
+EBUILD pluma-1.24.1.ebuild 1784 BLAKE2B 39b47155b554df35c3e24f4daa667532a6e5b25e4c7af2a8a9349ee6e3ddf8ba5978f81355f4ddb340d90803058a7fd17ec0b8c0d079bfa532d23267848e7326 SHA512 3e478d60f0d51e0a3cf7638e609d25778dc37667f1d34b6b1d4648b12a0ec0d57a415a252d5fc0c657543fbf212babd37e2aee10ab2de3cb86c8e895f5ee7e98
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
index 9d5382fbcd64..3b15fcea44a1 100644
--- a/app-editors/pluma/pluma-1.24.1.ebuild
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit mate python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 92616b5989b9..79719b046f18 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,4 +1,4 @@
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
-EBUILD qhexedit2-0.8.6_p20190316.ebuild 1868 BLAKE2B 6fd39f94f8a4d10f873548a66aac1095282a24ff3f21bd3350e590e9d3a5aa2e072418698862f56af77ea854cde02abd6a38f3047cc1f5ef3ec4a4f4f69016c7 SHA512 6db0ecc19a0255d17585233a144470941bbc6b4e9988fb36a3547fad95c7f333bf2bf04ef09292c17fe28f29cd9c79b5e69e9b3876f8640a438d37f9f69d0b08
+EBUILD qhexedit2-0.8.6_p20190316.ebuild 1872 BLAKE2B eee318093b6e657f9a1d32178333b20bd007a1358e213ce2121ff95d82fc4f8045f7bcc9952a8312aea419f0d9988ea61ecdf2634f1f87141392abe5ebbe57c5 SHA512 037c3ee4e84414cf891f655ee1e1e604f5c511d829c647544131424a288f00577461e379dcf7992f5a123ac449021974ba37fc65f7b950173619040b31ba60c4
 MISC metadata.xml 991 BLAKE2B 7faabbd43f1bdebee332845029ceef0824e380b70b7abe2adc9840391bba736941851433d58324886d4821f55ac83c67ff604b32d648acfd4c7e420662c5e155 SHA512 b079492a11df201b941d91991aef6161971ef15f80e7ca3ea71df2a0dbf2f193bc2514502e179321c7f688eb4f129401775bca9d9b657e3eec45e13c4c0948bb
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
index 2378ef10d4d9..843601fcc81e 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_OPTIONAL=1
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 68e971a87d8d..f883ffb22a04 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,7 +1,8 @@
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
 DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
 DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
-EBUILD scite-4.2.1.ebuild 2972 BLAKE2B 670cbed1ba766c7bbd3aae02dffd4eb6e78491b85f49f5353f3de5173717b4a9386e36d26e4a32a6db05938b9e7ea572b466753c24efdd50b172c57ec5dc02b8 SHA512 8f91f1ccd3ab9fc6ee30c6811a64b30c93f2b7a4b2feb1d2d192b2178ea2aba3b41d6d90a3380276302d117a414c7f13e0478ad919b5c2d74398cb82dab406ab
-EBUILD scite-4.3.3.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
-EBUILD scite-4.4.4.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
+EBUILD scite-4.2.1.ebuild 2973 BLAKE2B 3aac0ea6df96d31b14e32cf1947470f6b5f968b5fae3e8285e9c4170c8aea58aad3a2326d2cee4c2a7108754cbd5d2a34678e5abe85e9648a0d02242c244bece SHA512 833e3974d555f9cda3b538dbe89d5771c9a886e43b6dd74964d22ee70f4af300551c0251ddfbb62e137f8c97ddeac8bc8db714cdad2c5d8fd7aa59e2ec8c7c29
+EBUILD scite-4.3.3.ebuild 2857 BLAKE2B 8fb7183f7c8a340658ae270aa1197a03f22e03eaeb5106b3c5120254d278ee8b424e6769e04e1ddfcd7dcce5fd4a2cf19dbc13b2334baeca2fe59b0d228aa5fd SHA512 ccb75a47fd3a2dd4786dea41daca7d6ff29e4fe18b16d6628f147a2d46788c22c497180c27a98c980555ca72cf8d7aea99a7c642ac22b16a343e0a25185a1def
+EBUILD scite-4.4.4-r10.ebuild 2928 BLAKE2B ff03297d82e1933ec7c5c30fa7639cd284ef80ef95774550afb56c75951a412d351c4b8f8ccaa4942f1060bd5698dbe989cdbce1d517dcf6494b9523a43c5bd2 SHA512 33aa0f98a0df85c2f2be209f99021c7c1c96d38138a3754af23996045ba6861c636918652ebce4328c7fe8e6964e7133a1e256d9ef8f66b2cf3be3a392a05099
+EBUILD scite-4.4.4.ebuild 2857 BLAKE2B 8fb7183f7c8a340658ae270aa1197a03f22e03eaeb5106b3c5120254d278ee8b424e6769e04e1ddfcd7dcce5fd4a2cf19dbc13b2334baeca2fe59b0d228aa5fd SHA512 ccb75a47fd3a2dd4786dea41daca7d6ff29e4fe18b16d6628f147a2d46788c22c497180c27a98c980555ca72cf8d7aea99a7c642ac22b16a343e0a25185a1def
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index 648761d8d38b..b235fe2b806b 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3=
 	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
+	lua? ( >=dev-lang/lua-5:0= )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
index 9878fd6a6b64..791fb5eabe6c 100644
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
+	lua? ( >=dev-lang/lua-5:0= )"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-editors/scite/scite-4.4.4-r10.ebuild b/app-editors/scite/scite-4.4.4-r10.ebuild
new file mode 100644
index 000000000000..cc44dcb5cad6
--- /dev/null
+++ b/app-editors/scite/scite-4.4.4-r10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single toolchain-funcs xdg-utils
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="https://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	lua? ( ${LUA_DEPS} )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+DOCS=("../README")
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_pretend() {
+	if tc-is-clang ; then
+		# need c++17 features
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(clang-major-version) -lt 5 ]] &&
+		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
+		($(clang-major-version))."
+
+	elif tc-is-gcc; then
+		# older gcc is not supported
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(gcc-major-version) -lt 7 ]] &&
+		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
+	else
+		die "Either gcc or clang should be configured for building scite"
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX RANLIB
+
+	# remove hardcoded CC, Optimizations and clang unknown flags
+	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
+	-e "s#^CC = gcc#CC = ${CC}#" \
+	-e "s#^CC = clang#CC = ${CC}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
+	-e "s#-Os##" \
+	-e "s#-Wno-misleading-indentation##" \
+	|| die "error patching /scintilla/gtk/makefile"
+
+	sed -i "${S}/makefile" \
+	-e "s#^CC = clang#CC = ${CC}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
+	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+	-e "s#-Os##" \
+	|| die "error patching gtk/makefile"
+
+	# repair and enhance the .desktop file
+	sed -i "${S}/SciTE.desktop" \
+	-e "s#text/plain#text/\*;application/xhtml+xml#" \
+	-e "s#^Categories=\(.*\)#Categories=Development;#" \
+	|| die "error patching /scite/gtk/SciTe.desktop"
+
+	#  add the ebuild suffix as shell type for working with ebuilds
+	sed -i "${WORKDIR}/scite/src/perl.properties" \
+	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+	|| die "error patching /scite/src/perl.properties"
+
+	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
+	# Bug #576162
+
+	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
+	eapply_user
+}
+
+src_compile() {
+	# prepare make options
+	local emake_pars=("GTK3=1")
+
+	tc-is-clang && emake_pars+=("CLANG=1")
+	use !lua    && emake_pars+=("NO_LUA=1")
+
+	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
+	emake "${emake_pars[@]}"
+}
+
+# want to use the base src_install() as base_src_install()
+
+src_install() {
+	default
+	dosym SciTE /usr/bin/scite
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-editors/scite/scite-4.4.4.ebuild b/app-editors/scite/scite-4.4.4.ebuild
index 9878fd6a6b64..791fb5eabe6c 100644
--- a/app-editors/scite/scite-4.4.4.ebuild
+++ b/app-editors/scite/scite-4.4.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
+	lua? ( >=dev-lang/lua-5:0= )"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index 46f7ebc64d36..f3201eebc683 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -2,5 +2,5 @@ AUX shed-1.15-cflags.patch 249 BLAKE2B 6249d526da1a4b1df8f456692e85bdbd275be7517
 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.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
-EBUILD shed-1.15.ebuild 608 BLAKE2B 000613f1cef42ac582e385d816b2982ab2b6063867255d6138945b357629cc70a34b3a08fe8983f0e2e21767050fbdad2e23b4e4cc96ba3a26cd29c99162652c SHA512 f9a00e6cda4507f5e5e6c3d4a28bdb4ab54cdc132d18183ab60ec13ea5afc34f0bc24741d392af58bf054ede32cbc3c4025e2a1247faf4b29f2167863d00eaf7
+EBUILD shed-1.15.ebuild 615 BLAKE2B f52252ffab4f6fe24b89617b791e7412f78e7727234ca3f64faa69981259fe7662cd53d62c6faf8dd165778c2bc0e985502955eeefcf589c9c4e1108004aaec8 SHA512 eabe5181002bc511845cf56f5d968b676ccf816e1bae16375417319f9a9d86e63716228c0c24bda33306ab7b65c25081377b805c504b013c20da2c2671dfbfbd
 MISC metadata.xml 299 BLAKE2B ae48e2797586095e3e0d22645c036826b7165079cda4be2499cdf201e37806f0600086f9b0a6d52217b63f63e759c5d2ce02bddb2f828d1d4719898b0ad7f3a9 SHA512 ed903a7f91fa008f63e358253d7e66988cb57b616a8bf6e546f8a1d874e92524b29ef671a96f0e8fc56410619ff541d50e65ab788cf5373164d58b7afa625868
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index 8609122c355e..3c907f678988 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 172c72de5b3b..320de58ada0f 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -5,9 +5,9 @@ DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1
 DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
 DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-EBUILD vim-8.2.0360.ebuild 9047 BLAKE2B 61761262f606478b9bf0d3ed8a1e33d88675409b559b821285ac819222f8fb20cf4d1a473310b22a0f066e34d2794fb747f9abd66b83457e0ebe050e9ca0bfd4 SHA512 4de6099691f5bb9cb991b794bcfb257b835cf20d3dcb79e3715b9ffc92696a74094cddbd143734854420218e96bf9c482625c4c8d1cf0a55aafc07e128ce6fd0
-EBUILD vim-8.2.0508.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
-EBUILD vim-8.2.0638.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
-EBUILD vim-8.2.0814.ebuild 9038 BLAKE2B 12f7be7adb2400d6f40f111e2698d2624657e88f58568aacbce550b66c680e1b40bac96b23729ed6fa5d08c9c6d1d1198ba8c60884a3160e4fc019a36b510c99 SHA512 0bff46f5439445bd82cc3d314c6915bb9e2f83c3c4e94ca1711591ec2a393fb97933146b95d81db3620f848b51445434874c10cb7d9be2e41c8894a6df410fbc
-EBUILD vim-9999.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
+EBUILD vim-8.2.0360.ebuild 9077 BLAKE2B 11ce765d99e35db7846c24d1d3ba67f55f51c0b7b0f6bcf4185aa02519128f2b4ee5fcac79ccdd7569e4bcd3baca44fbf09656e17d51bce0dd649f8ed2ee4cc5 SHA512 cb7000a72ff5932f15b14f1d4795d2f5868808d9ebc65f1d5028c965672ebfe30b583f11abb6fb61da60722d24af96f71a27860b9f4163ac6e65be4e62df7c06
+EBUILD vim-8.2.0508.ebuild 9103 BLAKE2B 7986c1403923a5f311a58128d45f96a6d6a40614ebf5c390c51e15139d7aa97eedf313f4a07a3b027fe4a9875415cd51cf72670529213517dc42013370dccccb SHA512 74383ccfd3ac117724f12db87f54b36a44421c2e5bd5a6c922962ed1a126eef2abe276339e8932777a72cf3eb4972c2ce0760e717e13ee745658d128b260b3c3
+EBUILD vim-8.2.0638.ebuild 9103 BLAKE2B 7986c1403923a5f311a58128d45f96a6d6a40614ebf5c390c51e15139d7aa97eedf313f4a07a3b027fe4a9875415cd51cf72670529213517dc42013370dccccb SHA512 74383ccfd3ac117724f12db87f54b36a44421c2e5bd5a6c922962ed1a126eef2abe276339e8932777a72cf3eb4972c2ce0760e717e13ee745658d128b260b3c3
+EBUILD vim-8.2.0814.ebuild 9068 BLAKE2B 5473b43b82b9354d9732d271a2f9f0e6523b01b23469bff7526ebc023f6b62e8290d55f29487500122621b7cd077d8f491a9d5aca3b917fc475029eb52440d1b SHA512 aa8c0ac780b048b585554dee826f26c9b3205c956f12c9de36c1e8d51a4a37d05db8a9d104a558099011597d74cd7da694cf8242f6faea573bc41525b0fef3d8
+EBUILD vim-9999.ebuild 9103 BLAKE2B 7986c1403923a5f311a58128d45f96a6d6a40614ebf5c390c51e15139d7aa97eedf313f4a07a3b027fe4a9875415cd51cf72670529213517dc42013370dccccb SHA512 74383ccfd3ac117724f12db87f54b36a44421c2e5bd5a6c922962ed1a126eef2abe276339e8932777a72cf3eb4972c2ce0760e717e13ee745658d128b260b3c3
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.2.0360.ebuild b/app-editors/vim/vim-8.2.0360.ebuild
index d80d7777de3f..8a757434c46f 100644
--- a/app-editors/vim/vim-8.2.0360.ebuild
+++ b/app-editors/vim/vim-8.2.0360.ebuild
@@ -276,7 +276,9 @@ src_install() {
 	# 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
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
 	dosym vim /usr/bin/rvim
 	dosym vim /usr/bin/rview
 	if use vim-pager ; then
diff --git a/app-editors/vim/vim-8.2.0508.ebuild b/app-editors/vim/vim-8.2.0508.ebuild
index 5bc04c0d2b05..372853638330 100644
--- a/app-editors/vim/vim-8.2.0508.ebuild
+++ b/app-editors/vim/vim-8.2.0508.ebuild
@@ -276,7 +276,9 @@ src_install() {
 	# 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
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
 	dosym vim /usr/bin/rvim
 	dosym vim /usr/bin/rview
 	if use vim-pager ; then
diff --git a/app-editors/vim/vim-8.2.0638.ebuild b/app-editors/vim/vim-8.2.0638.ebuild
index 5bc04c0d2b05..372853638330 100644
--- a/app-editors/vim/vim-8.2.0638.ebuild
+++ b/app-editors/vim/vim-8.2.0638.ebuild
@@ -276,7 +276,9 @@ src_install() {
 	# 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
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
 	dosym vim /usr/bin/rvim
 	dosym vim /usr/bin/rview
 	if use vim-pager ; then
diff --git a/app-editors/vim/vim-8.2.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild
index 7becfb7071c6..946d309a7f6f 100644
--- a/app-editors/vim/vim-8.2.0814.ebuild
+++ b/app-editors/vim/vim-8.2.0814.ebuild
@@ -276,7 +276,9 @@ src_install() {
 	# 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
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
 	dosym vim /usr/bin/rvim
 	dosym vim /usr/bin/rview
 	if use vim-pager ; then
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 5bc04c0d2b05..372853638330 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -276,7 +276,9 @@ src_install() {
 	# 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
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
 	dosym vim /usr/bin/rvim
 	dosym vim /usr/bin/rview
 	if use vim-pager ; then
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 619b83c0e480..4a4e6e6317f8 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.6.ebuild 1696 BLAKE2B 651e46d6a9f8c2ba06b337dbdef90a796b8095f77a94baab2c1b9bd3b706223bb6abbab2e74eaeea791c2e4b12a86952a7ca19c3e6a31e1000ee0dac17a8e336 SHA512 ab68ff1949715e39a7df18a729b16b4dbad829ed94cd3ef6a787039b065dddca47de1c4175c83994d47fcdbe450feb6f1e1be6924fcf9b864aa1236a77471906
-EBUILD vis-9999.ebuild 1271 BLAKE2B 7cc5f74cdd5322bcfa8458bb4e2820466f54ffa1631a636925d79ab1b0568079434e31307df6f6251801b4fee7686b185b9aa5f30c45855eeda3d4c47fb34c66 SHA512 e0196ba4a01430415e6ec3cd0b6daa430486b7c5b2a9cfffc7bc99baa953e3f6465175a0fd2eeeb00ae46f6c70b3222e45537a1a05e314661e53e455406189a7
+EBUILD vis-0.6.ebuild 1824 BLAKE2B 18aa9ce42e49017d27d5f8e6cbf23637b1b8b6a7898de585ad9207cce202ba654cd1dfb820ca75094bab3bb788e163b640bb06437374da14ee60fc6e8d7fad33 SHA512 08e3396687189cc71665b96e64017fa0eec55b6354aedb4a8c6ecaea47d9a5fb846f8670aad4fcabb124c914b1751d93e6e16da181322a011d50d10f596a0025
+EBUILD vis-9999.ebuild 1391 BLAKE2B c5184f951e9d5504f46a2d1230b5b6152520846d2de9d0369365d3cf08a7fbf7eb62698c51b11d931af4d6c739e456288b7ce4f810467247ca0e68c20b591425 SHA512 a36953764bd71e88cf4378c4d63c805fef4f1de2c0601503f9c56a9865fce852168b81f915745b28b0327b9c84fb4a87ecc63aeba4ba12fcdf573d46f60bb1b8
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild
index 7a2ce6eaaa69..722f5a71fc9c 100644
--- a/app-editors/vis/vis-0.6.ebuild
+++ b/app-editors/vis/vis-0.6.ebuild
@@ -4,6 +4,9 @@
 EAPI=7
 
 MY_PTV=0.4
+LUA_COMPAT=( lua5-2 lua5-3 )
+
+inherit lua-single optfeature
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
@@ -12,18 +15,22 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+ncurses selinux test tre"
+IUSE="+ncurses +lua selinux test tre"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-# - ::lua package done for using >=dev-lang/lua-5.2
-# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	if use test; then
 		rm -r test || die
@@ -44,6 +51,7 @@ src_configure() {
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable lua) \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
 		$(use_enable tre) || die
@@ -60,4 +68,5 @@ pkg_postrm() {
 
 pkg_postinst() {
 	update_symlinks
+	optfeature "syntax highlighting support" dev-lua/lpeg
 }
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 600b5efb0576..38ea0ff6ecd6 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3
+LUA_COMPAT=( lua5-2 lua5-3 )
+
+inherit lua-single git-r3 optfeature
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
@@ -10,18 +12,22 @@ EGIT_REPO_URI="https://github.com/martanne/vis.git"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ncurses selinux test tre"
+IUSE="+ncurses +lua selinux test tre"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-# - ::lua package done for using >=dev-lang/lua-5.2
-# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
 	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
@@ -34,6 +40,7 @@ src_configure() {
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable lua) \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
 		$(use_enable tre) || die
@@ -50,4 +57,5 @@ pkg_postrm() {
 
 pkg_postinst() {
 	update_symlinks
+	optfeature "syntax highlighting support" dev-lua/lpeg
 }