gentoo resync : 03.03.2021

23 files changed, 141 insertions, 643 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index faeba4a5678e..8ea5e269b584 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 874c45ae33cf..f010a839d16e 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,7 +9,7 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD gvim-8.2.0360.ebuild 10313 BLAKE2B ea2e2ce7b5e450fb3d289ac9faaa18b6a933f766d4ca7644109ec70146499038dc04fddf0f09fecd7498182e8c740fe34393ac6e1f90026f82db1c1a1d19fa42 SHA512 85347144ebd2272dab28fbe70f74004a9afc35f613c672a82c3c2ea83b61a73cad0c64c20d2a998487d71a5cc9d19a5be42d13bfc481a9783d5f9d244e0b4599
 EBUILD gvim-8.2.0508.ebuild 10339 BLAKE2B 1e0ffce1971142f6ef078e80af5385e860c1a137cc11823febc97075f0ec738cb29fc3d67f041b72bfb1579acd14789c5a0454a0630b2991a55cda14034211d6 SHA512 611b49d03b4c76ca349b2cf43bf87b1d4cca1d9e12fe2060bc92032a879c8bb65da9c98b1a3717f9d9329eef3d27f0718c233f36f8846e2c367cd720a5ce5f40
 EBUILD gvim-8.2.0638.ebuild 10345 BLAKE2B aafc43bf70436dd470f4c60021570bbf74c93a4b86f89c8ccddd202180f656a86eb720bcd068ba3e099bac032559ba19003a7aa5df535e02be0471536261feaf SHA512 c30e68ea4bb40077f4c84f388cb725bef5e673512746b75e9462dd4be7b9354b53110152243359bc2300f1d9366bd251d1c82142dbfb9924ec025c170ebd1926
-EBUILD gvim-8.2.0814-r100.ebuild 10540 BLAKE2B dc7458bc17cb7268f4a685122342ebb6687b211b2e2995d0a1003ccadd9858d672880f88ad0dcf9acadace7d457c067966385749f4e52def4ae93bd3619352f7 SHA512 01ab3cf441778188aed13f18fd5a92790a6d826329093841e95b63f55c82da888c286c153f93b168f6dbedabb949959e895e445524c92aeaae7a6043e01cdf1d
+EBUILD gvim-8.2.0814-r100.ebuild 10546 BLAKE2B 841485b310036388cb0cb7ab307d38c52ab198864b8c3cc87961383c9db4255c84b9dd114a5646f17c53549bf6e8e982d1b730168b53d308477cd59afa70c111 SHA512 15a4fdd6a2323e36b282cb5015af08d9db10ece57748d4c80384c029b3c88b601a7886ef2bbedc838dcac5c7adcfdc77db7628506ac09cde973430f209de2fd0
 EBUILD gvim-8.2.0814.ebuild 10307 BLAKE2B 9af152197af41c638a9a9f105de8efff0985b00304f989da8adf5461cb95bf196ee78a78d14f2d582bbac995b69521024e1c44250ebe63225cf1e1199b168549 SHA512 7d459841bac0e06f2009c325e17c45c58f3b7afe13a1e1603460511e603d95bda63faa306667d23f18702c41486f749cf7e14cd371349d01e99a0201c4d582ba
 EBUILD gvim-9999.ebuild 10547 BLAKE2B 6abec7c8cccb5fd62fe8db99ed9b2e14faeaf51c568fc44d2bf8bc1e8d6500419f2941d8f10a37bb5b687c44072bcc1a779315dcd4b97230b498d15927942057 SHA512 ced89d9e42b23607c01ee2e27a87ced1398b7431d6bcb05c743b1c0b6a780239083b94b898fb57053a1adfa84d6962c248c5abd7668f7eb02888be0aa2fda277
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
index 8c637d3504b9..82416af61adb 100644
--- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
@@ -17,7 +17,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-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index 8b8df2a21621..d0ef6111a826 100644
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@@ -1,4 +1,4 @@
 AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a
 DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb
-EBUILD hexedit-1.2.13.ebuild 683 BLAKE2B 53b0e7f29c26cd216c6fd766de54044d94dd9c34217c6bfed69244100b6cb28be935836e6b1815438ef07b150305f32073f443c1df4f832bc12938d601484a81 SHA512 eb547069a31b3ef40027fdec06857ec30d47787988bc078044e17e973a32aae411f9d323ebd4d7ca9437908bac5c59dba9b19654bea21d1fa4dbda5f8245115d
+EBUILD hexedit-1.2.13.ebuild 682 BLAKE2B 3b9fda7e50453e587771de817f16ffc21067c1e26a7e652f2a3489dfb91e5fbe32e84cb577f32d94bb6672ec0272df4997ee9e7094a0711f2378ae3382e27928 SHA512 3ac27996bb10539af4ced5ff23e4988641da55920ed9719c2473c714db78c84e59a69fc90f7dd92be65e2f3b5d375f73baa8b3acc2b7934f4b44f0ada9d40479
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index 7bd04eb1bd36..299f969f1681 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rigaux.org/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index bf889d99e24b..4ed246f6b93d 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,11 +1,6 @@
-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
-DIST mousepad-0.5.1.tar.bz2 826973 BLAKE2B 6e0ae6570221b8e7ecfc5b7bf513eb7bf6efd745f977d46a1bc78d9ef4d59984964abc423f381d5170edc4a44f6672f1fa44f4bdc898260c43d0685c3603da30 SHA512 2b9403332f370bb75bf03a0e0aeab2b2f889fcd2fcef54e6d958e82933f5b6044dbf9416cf0ca5b43f4c304bb93dec185c647ebb40ed3915a87a15b76cf2e634
+AUX mousepad-0.5.2-select-all.patch 1019 BLAKE2B cdc2bb2ea67d3e51da322abdc3fcbfc9d0b8ceb47e61f7dc35e8ecf3ed691006ec4e57726446653dfc54d9161cbea13b0d57496645320e69df6a5556df8bbe96 SHA512 6a4dcae46012637405c6b2c7aa673036105771da2c23fe39b4d33b6c38ea8a069b8897c2d14e0959353a51a02bc23e5ff2f0db86ae7c48cc3f5b94cc03480330
 DIST mousepad-0.5.2.tar.bz2 850592 BLAKE2B a30185f7a9c276eb5744db4664cdc9ad41520ec12018118f5ddfc2d39a5a5d6545d90222660d585c5b570c9e5a32c921edf2d727adcfad6addacdaa412d094e4 SHA512 03302b95f411240d19631b48fe462e47b7d6fa9cc0df07b9de2e56f1f402a9058ab423353ab8b3530ad14889e62299c7a1bed020349cca059d13566c6b8db8b8
-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
-EBUILD mousepad-0.5.1.ebuild 805 BLAKE2B cde75bb7e88a035666a424fa564a25b9a86603cfae0f01e3386a059edc79c8bf8a443b6f72cece43179c3e2e392bf879614bba0616212e5ef2c407c8aa40bd76 SHA512 4d435c9f3bb029379089d10f557c3de198b8731faab94abcdf6f8bf4ebf959df59498a279441c5599b9fd62e42d6d789fb2a01e47690af10baf8a16604ccb1ce
-EBUILD mousepad-0.5.2.ebuild 805 BLAKE2B ea302e5b264c71fd86aba7b465ce08b48ac054ad5c7b0699939d6a8e9f4549526b828f5d2e83fdd41052139dfb0a9908072b709024e88485051a708710c4c73d SHA512 6026a8a1511888d2c83ee9cee907dbf8f16271d4e5b0d86eeca9a450787ddd270366a6857e0280d11a514f1df550c992619f11773d048805ea3cb3dddefaff0e
-MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
+DIST mousepad-0.5.3.tar.bz2 848169 BLAKE2B c5001d5a1f3c8ef820fdf2297679b8c7acae7cb08ed134529b7b1e0861e8d9b36c9495b6a207371c9e6a0f59a3f7bd41adaa678250d96ab7112427d5cfc2aa0d SHA512 596d85a9b7caa1616bd5adc2bb4f7ddbdf47d9e4a049f100581ecba9c61db5243f45d3dd8217ecaed1803c73c2221a396817790efe3898c487c12c8ce8d328c6
+EBUILD mousepad-0.5.2-r1.ebuild 863 BLAKE2B 01428fc40098ea9e23b35152c594c295e463854bf2c382957a6b67097b7a53205b5826413d84540ba4ec42de635bd09f2b367985b83bdd71c4bd5141a454cfe0 SHA512 ef0c3b0587389e009b59d0de6abe438de696002a361343f358545f06a6a0605531f7a3b96dd9ff853f2ec51ea3dea6ccda4af6966cf2d5bc42b437568df75781
+EBUILD mousepad-0.5.3-r1.ebuild 865 BLAKE2B 36e3d9ee9c05926ff259e23de341d8f4843d6948d4a127e7a39a2e802f388a1f27a50d8ce6788bceb460ef8fa930a32287f6bb4aa477bfbea0a9a7b5f668cf5a SHA512 dced3ce1d2119bfeda67143211c9c19d6ac41b5e4787b0e0765b75ffb549d9f256c409ae96fc62a3789d550a53cf3f2378fa34e2ce471892bc4ffdc2b0b03ee1
+MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/app-editors/mousepad/files/mousepad-0.5.2-select-all.patch b/app-editors/mousepad/files/mousepad-0.5.2-select-all.patch
new file mode 100644
index 000000000000..46762e687c46
--- /dev/null
+++ b/app-editors/mousepad/files/mousepad-0.5.2-select-all.patch
@@ -0,0 +1,28 @@
+From 8473653ad37a32375ff416205c0f44f771f380df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 1 Mar 2021 13:36:33 +0100
+Subject: [PATCH] Fix missing parameter to "select-all" signal
+
+Add missing "select" parameter to the "select-all" signal.  This fixes
+undefined behavior reported in https://bugs.gentoo.org/772245.
+Thanks to Mart Raudsepp for figuring out the problem.
+---
+ mousepad/mousepad-window.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
+index 2f901b2..9ba6223 100644
+--- a/mousepad/mousepad-window.c
++++ b/mousepad/mousepad-window.c
+@@ -5223,7 +5223,7 @@ mousepad_window_action_select_all (GSimpleAction *action,
+   g_return_if_fail (MOUSEPAD_IS_DOCUMENT (window->active));
+ 
+   /* select everything in the document */
+-  g_signal_emit_by_name (window->active->textview, "select-all");
++  g_signal_emit_by_name (window->active->textview, "select-all", TRUE);
+ }
+ 
+ 
+-- 
+GitLab
+
diff --git a/app-editors/mousepad/metadata.xml b/app-editors/mousepad/metadata.xml
index e44ea637f98f..dce6704738a4 100644
--- a/app-editors/mousepad/metadata.xml
+++ b/app-editors/mousepad/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/mousepad/mousepad-0.4.2.ebuild b/app-editors/mousepad/mousepad-0.4.2.ebuild
deleted file mode 100644
index d2e953338abb..000000000000
--- a/app-editors/mousepad/mousepad-0.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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"
-IUSE="dbus +gtk3"
-# D-Bus code fails to build against GTK+2
-# https://bugzilla.xfce.org/show_bug.cgi?id=15755
-REQUIRED_USE="dbus? ( gtk3 )"
-
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=xfce-base/xfconf-4.12:=
-	!gtk3? ( >=x11-libs/gtk+-2.24:2=
-		x11-libs/gtksourceview:2.0= )
-	gtk3? ( >=x11-libs/gtk+-3.20:3=
-		x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	dbus? ( dev-util/gdbus-codegen )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable dbus)
-		$(use_enable gtk3)
-		)
-
-	econf "${myconf[@]}"
-}
-
-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/mousepad/mousepad-0.4.90.ebuild b/app-editors/mousepad/mousepad-0.4.90.ebuild
deleted file mode 100644
index 8d5d963fcc26..000000000000
--- a/app-editors/mousepad/mousepad-0.4.90.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/mousepad/mousepad-0.5.0.ebuild b/app-editors/mousepad/mousepad-0.5.0.ebuild
deleted file mode 100644
index 8d5d963fcc26..000000000000
--- a/app-editors/mousepad/mousepad-0.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/mousepad/mousepad-0.5.1.ebuild b/app-editors/mousepad/mousepad-0.5.2-r1.ebuild
index 799f077cd25d..ed7d2cd8fcf0 100644
--- a/app-editors/mousepad/mousepad-0.5.1.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/glib-2.52
 	>=xfce-base/xfconf-4.12:=
@@ -23,6 +23,10 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/mousepad-0.5.2-select-all.patch
+)
+
 pkg_postinst() {
 	gnome2_schemas_update
 	xdg_desktop_database_update
diff --git a/app-editors/mousepad/mousepad-0.5.2.ebuild b/app-editors/mousepad/mousepad-0.5.3-r1.ebuild
index 727e1bf86564..3440cd70cd85 100644
--- a/app-editors/mousepad/mousepad-0.5.2.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.3-r1.ebuild
@@ -23,6 +23,10 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/mousepad-0.5.2-select-all.patch
+)
+
 pkg_postinst() {
 	gnome2_schemas_update
 	xdg_desktop_database_update
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 6e31f6464afa..2319d2da0e74 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,12 +1,8 @@
-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.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
-DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
 DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
-EBUILD nano-4.9.3.ebuild 2303 BLAKE2B ae1b5d040e6c7be9d49ca11fbf8dd63d93b6ae74093ac9795e8e9c0f61532b4dae83ba4ecd1179469edda487babacb0c4fafcb23155039d2ba052bb01d1026e4 SHA512 7afddc9908b55b2a397915a2a1716c775ac09666eacee600873a19bf0103c49202daa5880a9f19115b6a1488f42dcab16e235cec2c3f8b285254e51a6183fbeb
+DIST nano-5.6.tar.gz 2956090 BLAKE2B 753c49e67403577ac272438b2a577f29978f621cb1823f3ccc4fb5df229b805c72a7123d5e5632cb9e1d4b50c7cf90675d748e7e88709703be44126e11231974 SHA512 fff8a558b435b9f372f19306e63c3bad34a60b4b1979ddf2a5724f96ca69fd7fd5850e841f714fad2e382ffc8e5c3f5085f6a6e965ff30f44bf12b8ac865fe6b
 EBUILD nano-5.3-r1.ebuild 2417 BLAKE2B 67f81d38936522e480337cdedd8156835e01c92cfe80f4126787015e822ecaec935bcb008a6e02808af155f0dc15b14d3cb209e4583818f1a0a45607004b4bae SHA512 a4b0af913ea15fcdf05e2a6d76eabedcd7833d2a01f879223c1a39a8b670c46c7230b36cfffc57f35b971c875552d21ca184dc108bcc044c87551bd4067f5312
-EBUILD nano-5.4.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af
 EBUILD nano-5.5.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
+EBUILD nano-5.6.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
 EBUILD nano-9999.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
deleted file mode 100644
index 978e24de805d..000000000000
--- a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Mon, 22 Jun 2020 08:39:59 +0200
-Subject: [PATCH] build: fix compilation when configured with
- --disable-speller
-
-Move two functions that are used by the formatter too
-to between the proper #ifdef.
-
-Problem existed since commit 8089f5ad from a month ago.
-
-Backported to v4.9.3
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/text.c | 302 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 151 insertions(+), 151 deletions(-)
-
-diff --git a/src/text.c b/src/text.c
-index 93ad3704..c7690fd0 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -2011,8 +2011,159 @@ void construct_argument_list(char ***arguments, char *command, char *filename)
- 	(*arguments)[count - 2] = filename;
- 	(*arguments)[count - 1] = NULL;
- }
-+
-+/* Open the specified file, and if that succeeds, remove the text of the marked
-+ * region or of the entire buffer and read the file contents into its place. */
-+bool replace_buffer(const char *filename, undo_type action, const char *operation)
-+{
-+	linestruct *was_cutbuffer = cutbuffer;
-+	int descriptor;
-+	FILE *stream;
-+
-+	descriptor = open_file(filename, FALSE, &stream);
-+
-+	if (descriptor < 0)
-+		return FALSE;
-+
-+	cutbuffer = NULL;
-+
-+#ifndef NANO_TINY
-+	add_undo(COUPLE_BEGIN, operation);
-+
-+	/* Cut either the marked region or the whole buffer. */
-+	add_undo(action, NULL);
-+#endif
-+	do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
-+#ifndef NANO_TINY
-+	update_undo(action);
- #endif
- 
-+	/* Discard what was cut. */
-+	free_lines(cutbuffer);
-+	cutbuffer = was_cutbuffer;
-+
-+	/* Insert the spell-checked file into the cleared area. */
-+	read_file(stream, descriptor, filename, TRUE);
-+
-+#ifndef NANO_TINY
-+	add_undo(COUPLE_END, operation);
-+#endif
-+	return TRUE;
-+}
-+
-+/* Execute the given program, with the given temp file as last argument. */
-+const char *treat(char *tempfile_name, char *theprogram, bool spelling)
-+{
-+	ssize_t lineno_save = openfile->current->lineno;
-+	size_t current_x_save = openfile->current_x;
-+	size_t pww_save = openfile->placewewant;
-+	bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
-+	struct stat fileinfo;
-+	long timestamp_sec, timestamp_nsec;
-+	static char **arguments = NULL;
-+	pid_t thepid;
-+	int program_status;
-+	bool replaced = FALSE;
-+
-+	/* Get the timestamp and the size of the temporary file. */
-+	stat(tempfile_name, &fileinfo);
-+	timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
-+	timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
-+
-+	/* If the number of bytes to check is zero, get out. */
-+	if (fileinfo.st_size == 0)
-+		return NULL;
-+
-+	/* Exit from curses mode to give the program control of the terminal. */
-+	endwin();
-+
-+	construct_argument_list(&arguments, theprogram, tempfile_name);
-+
-+	/* Fork a child process and run the given program in it. */
-+	if ((thepid = fork()) == 0) {
-+		execvp(arguments[0], arguments);
-+
-+		/* Terminate the child if the program is not found. */
-+		exit(9);
-+	} else if (thepid < 0)
-+		return _("Could not fork");
-+
-+	/* Block SIGWINCHes while waiting for the program to end,
-+	 * so nano doesn't get pushed past the wait(). */
-+	block_sigwinch(TRUE);
-+	wait(&program_status);
-+	block_sigwinch(FALSE);
-+
-+	/* Restore the terminal state and reenter curses mode. */
-+	terminal_init();
-+	doupdate();
-+
-+	if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
-+		statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
-+		return NULL;
-+	} else if (WEXITSTATUS(program_status) != 0)
-+		statusline(ALERT, _("Program '%s' complained"), arguments[0]);
-+
-+	/* Stat the temporary file again. */
-+	stat(tempfile_name, &fileinfo);
-+
-+	/* When the temporary file wasn't touched, say so and leave. */
-+	if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
-+				(long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
-+		statusbar(_("Nothing changed"));
-+		return NULL;
-+	}
-+
-+#ifndef NANO_TINY
-+	/* Replace the marked text (or entire text) with the corrected text. */
-+	if (spelling && openfile->mark) {
-+		ssize_t was_mark_lineno = openfile->mark->lineno;
-+		bool upright = mark_is_before_cursor();
-+
-+		replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
-+
-+		/* Adjust the end point of the marked region for any change in
-+		 * length of the region's last line. */
-+		if (upright)
-+			current_x_save = openfile->current_x;
-+		else
-+			openfile->mark_x = openfile->current_x;
-+
-+		/* Restore the mark. */
-+		openfile->mark = line_from_number(was_mark_lineno);
-+	} else
-+#endif
-+	{
-+		openfile->current = openfile->filetop;
-+		openfile->current_x = 0;
-+
-+		replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
-+					/* TRANSLATORS: The next two go with Undid/Redid messages. */
-+					(spelling ? N_("spelling correction") : N_("formatting")));
-+	}
-+
-+	/* Go back to the old position. */
-+	goto_line_posx(lineno_save, current_x_save);
-+	if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
-+		openfile->current_x = strlen(openfile->current->data);
-+
-+#ifndef NANO_TINY
-+	if (replaced)
-+		update_undo(COUPLE_END);
-+#endif
-+
-+	openfile->placewewant = pww_save;
-+	adjust_viewport(STATIONARY);
-+
-+	if (spelling)
-+		statusbar(_("Finished checking spelling"));
-+	else
-+		statusbar(_("Buffer has been processed"));
-+
-+	return NULL;
-+}
-+#endif /* ENABLE_SPELLER || ENABLE_COLOR */
-+
- #ifdef ENABLE_SPELLER
- /* Let the user edit the misspelled word.  Return FALSE if the user cancels. */
- bool fix_spello(const char *word)
-@@ -2307,157 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
- 	return NULL;
- }
- 
--/* Open the specified file, and if that succeeds, remove the text of the marked
-- * region or of the entire buffer and read the file contents into its place. */
--bool replace_buffer(const char *filename, undo_type action, const char *operation)
--{
--	linestruct *was_cutbuffer = cutbuffer;
--	int descriptor;
--	FILE *stream;
--
--	descriptor = open_file(filename, FALSE, &stream);
--
--	if (descriptor < 0)
--		return FALSE;
--
--	cutbuffer = NULL;
--
--#ifndef NANO_TINY
--	add_undo(COUPLE_BEGIN, operation);
--
--	/* Cut either the marked region or the whole buffer. */
--	add_undo(action, NULL);
--#endif
--	do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
--#ifndef NANO_TINY
--	update_undo(action);
--#endif
--
--	/* Discard what was cut. */
--	free_lines(cutbuffer);
--	cutbuffer = was_cutbuffer;
--
--	/* Insert the spell-checked file into the cleared area. */
--	read_file(stream, descriptor, filename, TRUE);
--
--#ifndef NANO_TINY
--	add_undo(COUPLE_END, operation);
--#endif
--	return TRUE;
--}
--
--/* Execute the given program, with the given temp file as last argument. */
--const char *treat(char *tempfile_name, char *theprogram, bool spelling)
--{
--	ssize_t lineno_save = openfile->current->lineno;
--	size_t current_x_save = openfile->current_x;
--	size_t pww_save = openfile->placewewant;
--	bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
--	struct stat fileinfo;
--	long timestamp_sec, timestamp_nsec;
--	static char **arguments = NULL;
--	pid_t thepid;
--	int program_status;
--	bool replaced = FALSE;
--
--	/* Get the timestamp and the size of the temporary file. */
--	stat(tempfile_name, &fileinfo);
--	timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
--	timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
--
--	/* If the number of bytes to check is zero, get out. */
--	if (fileinfo.st_size == 0)
--		return NULL;
--
--	/* Exit from curses mode to give the program control of the terminal. */
--	endwin();
--
--	construct_argument_list(&arguments, theprogram, tempfile_name);
--
--	/* Fork a child process and run the given program in it. */
--	if ((thepid = fork()) == 0) {
--		execvp(arguments[0], arguments);
--
--		/* Terminate the child if the program is not found. */
--		exit(9);
--	} else if (thepid < 0)
--		return _("Could not fork");
--
--	/* Block SIGWINCHes while waiting for the program to end,
--	 * so nano doesn't get pushed past the wait(). */
--	block_sigwinch(TRUE);
--	wait(&program_status);
--	block_sigwinch(FALSE);
--
--	/* Restore the terminal state and reenter curses mode. */
--	terminal_init();
--	doupdate();
--
--	if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
--		statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
--		return NULL;
--	} else if (WEXITSTATUS(program_status) != 0)
--		statusline(ALERT, _("Program '%s' complained"), arguments[0]);
--
--	/* Stat the temporary file again. */
--	stat(tempfile_name, &fileinfo);
--
--	/* When the temporary file wasn't touched, say so and leave. */
--	if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
--				(long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
--		statusbar(_("Nothing changed"));
--		return NULL;
--	}
--
--#ifndef NANO_TINY
--	/* Replace the marked text (or entire text) with the corrected text. */
--	if (spelling && openfile->mark) {
--		ssize_t was_mark_lineno = openfile->mark->lineno;
--		bool upright = mark_is_before_cursor();
--
--		replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
--
--		/* Adjust the end point of the marked region for any change in
--		 * length of the region's last line. */
--		if (upright)
--			current_x_save = openfile->current_x;
--		else
--			openfile->mark_x = openfile->current_x;
--
--		/* Restore the mark. */
--		openfile->mark = line_from_number(was_mark_lineno);
--	} else
--#endif
--	{
--		openfile->current = openfile->filetop;
--		openfile->current_x = 0;
--
--		replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
--					/* TRANSLATORS: The next two go with Undid/Redid messages. */
--					(spelling ? N_("spelling correction") : N_("formatting")));
--	}
--
--	/* Go back to the old position. */
--	goto_line_posx(lineno_save, current_x_save);
--	if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
--		openfile->current_x = strlen(openfile->current->data);
--
--#ifndef NANO_TINY
--	if (replaced)
--		update_undo(COUPLE_END);
--#endif
--
--	openfile->placewewant = pww_save;
--	adjust_viewport(STATIONARY);
--
--	if (spelling)
--		statusbar(_("Finished checking spelling"));
--	else
--		statusbar(_("Buffer has been processed"));
--
--	return NULL;
--}
--
- /* Spell check the current file.  If an alternate spell checker is
-  * specified, use it.  Otherwise, use the internal spell checker. */
- void do_spell(void)
--- 
-2.28.0
-
diff --git a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
deleted file mode 100644
index 52112bab7235..000000000000
--- a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Mon, 22 Jun 2020 14:00:23 +0200
-Subject: [PATCH] build: fix compilation for --enable-tiny --enable-color
- --enable-nanorc
-
-Backported to v4.9.3
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/nano.c | 2 +-
- src/text.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index be80a073..3ac81ba4 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -1079,7 +1079,7 @@ RETSIGTYPE do_continue(int signal)
- 	ungetch(KEY_FLUSH);
- }
- 
--#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
-+#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)
- /* Block or unblock the SIGWINCH signal, depending on the blockit parameter. */
- void block_sigwinch(bool blockit)
- {
-diff --git a/src/text.c b/src/text.c
-index c7690fd0..32727946 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -2032,10 +2032,10 @@ bool replace_buffer(const char *filename, undo_type action, const char *operatio
- 
- 	/* Cut either the marked region or the whole buffer. */
- 	add_undo(action, NULL);
--#endif
- 	do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
--#ifndef NANO_TINY
- 	update_undo(action);
-+#else
-+	do_snip(FALSE, TRUE, FALSE, FALSE);
- #endif
- 
- 	/* Discard what was cut. */
--- 
-2.28.0
-
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
deleted file mode 100644
index 869ecf6995d1..000000000000
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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
-"
-
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-speller_build_fix.patch"
-	"${FILESDIR}/${P}-minimal_build_fix.patch" #734856
-)
-
-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/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.6.ebuild
index 92473ae856c8..64c74e70f9b1 100644
--- a/app-editors/nano/nano-5.4.ebuild
+++ b/app-editors/nano/nano-5.6.ebuild
@@ -18,13 +18,12 @@ 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 +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(+)] ) )"
+	nls? ( virtual/libintl )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
@@ -34,7 +33,6 @@ BDEPEND="
 "
 
 REQUIRED_USE="
-	!ncurses? ( slang? ( minimal ) )
 	magic? ( !minimal )
 "
 
@@ -60,7 +58,6 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable unicode utf8)
 		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
 	)
 	econf "${myconf[@]}"
 }
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index f51b7b84c651..dd6373eca8d4 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,4 +1,6 @@
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
+DIST ReText-7.2.0.tar.gz 516895 BLAKE2B e35cfa59b248135be4454359516c36f94e927cb13d60669cffde6b8b70eb5049e2083e6bd50ea1f602f7454025271599a92e34d4bc95920cb17271882f8f6d31 SHA512 ed1cb0088fcd3f1cba96bb07137766c6ae8177e8c9a91f22334ef2f949b58792e03f0b5022d9ef71bfb611b7969c651b4c7920f48ed8e1ad07caff2f69c85a35
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 6035dcc2cc18d8058ab116873db58b1a97c65df58a813dae6136b59e1335c3addb198220669d7ea9bfe0274f427a1fbc146f4ff78f49ec61afb58852a340af04 SHA512 0221e5f05f50d2cf16dd625ab06e9421eefdfc889af1ab45cde6500031d8b695cc8585704f29dc3ba7c40cc55c6d54e9e7b3d685c2fdb2d257bed92c926c87fa
-EBUILD retext-9999.ebuild 1819 BLAKE2B 9c152888905c1a661ac3d733a86bbbc70fe6cd4e242be81d6be6c9e0f7850aa4b273a8641c5c1b536acb3c55502e418d97cdc5d9781177525cf230ab40bdd615 SHA512 fe8a0991975ccf2db9305373d5168319f5828a06c2804dd29704e3473eba3c7a3fb606da212bea5e1d3f2fc20f11b65b885dab8dc050bcdd69a2bcf0fa6cf6d0
+EBUILD retext-7.2.0-r1.ebuild 1966 BLAKE2B 88148cf5fd35d5f1f319b387d5fe34c9f57d0b36f12951b517d9f73a8d0b28c3ec1629e838750046d0fb66c75b46b6f61c6c7d8267cbcaa9e18ed434d114eee0 SHA512 5c79c14f6b5160cfc760f658d30e25ffd3e98bb035faa8100054531a6e554ff33e6ed2adcb62c69c3d05256f1d00af41ef8f4e374012a5c90b64666c834bb336
+EBUILD retext-9999.ebuild 1966 BLAKE2B 88148cf5fd35d5f1f319b387d5fe34c9f57d0b36f12951b517d9f73a8d0b28c3ec1629e838750046d0fb66c75b46b6f61c6c7d8267cbcaa9e18ed434d114eee0 SHA512 5c79c14f6b5160cfc760f658d30e25ffd3e98bb035faa8100054531a6e554ff33e6ed2adcb62c69c3d05256f1d00af41ef8f4e374012a5c90b64666c834bb336
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/retext-7.2.0-r1.ebuild b/app-editors/retext/retext-7.2.0-r1.ebuild
new file mode 100644
index 000000000000..4da9da3b40b9
--- /dev/null
+++ b/app-editors/retext/retext-7.2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please don't add pypy support before testing if it's actually supported. The
+# old compat matrix is no longer accessible as of 2021-02-13 but stated back
+# in 2020-07-05 that PyQt5 was explicitly not supported.
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 optfeature virtualx xdg-utils
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+
+if [[ ${PV} == *9999 ]]
+	then
+		inherit git-r3
+		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+	else
+		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~x86"
+		S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	optfeature "dictionary support" dev-python/pyenchant
+	# See https://bugs.gentoo.org/772197.
+	optfeature "rendering with webengine" dev-python/PyQtWebEngine
+
+	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+	einfo "For more details take a look at:"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"	
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 33902ed3198e..4da9da3b40b9 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# no pypy{,3} support as PyQt5 does not support it at 2020-07-05 (towelday)
-# https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
-PYTHON_COMPAT=( python3_{7,8,9} )
+# Please don't add pypy support before testing if it's actually supported. The
+# old compat matrix is no longer accessible as of 2021-02-13 but stated back
+# in 2020-07-05 that PyQt5 was explicitly not supported.
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1 optfeature virtualx xdg-utils
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999 ]]
 	else
 		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 		KEYWORDS="~amd64 ~x86"
-		S="${WORKDIR}"/${MY_P}
+		S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2+"
@@ -37,10 +37,10 @@ RDEPEND="
 	dev-python/markups[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
 
 src_test() {
 	virtx distutils-r1_src_test
@@ -55,11 +55,13 @@ pkg_postinst() {
 	xdg_icon_cache_update
 
 	optfeature "dictionary support" dev-python/pyenchant
+	# See https://bugs.gentoo.org/772197.
+	optfeature "rendering with webengine" dev-python/PyQtWebEngine
 
 	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
 	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
 	einfo "For more details take a look at:"
-	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"	
 }
 
 pkg_postrm() {
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 42d9aa2d3c5f..de4fe2031a42 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348a
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.7.ebuild 2085 BLAKE2B 1f924e149cbdaff3610bbe703060f4c63fac6221ee2a554588c5ca7eaf25be57be5ecff89d42d0b0263127b0ea0bae68a6bd64037f459b8716441bfae4f76354 SHA512 3642b00f52bd4c86a87b1426f13b5dd5abab6a5a39a41d54d6dad78a31cd907d35b75a75501e26b485427e6d2b450a534a69570eac7af9a7121a84c5f4504a92
+EBUILD vis-0.7.ebuild 2084 BLAKE2B 5b8d2439231f15ccad19fe711b41153ce1da890976fd39a034cb986252b20d76ee9f7434c68af42f4f57b90c092616ddf0e17b57d8cc2633e89c8f32dbbfe200 SHA512 33ccd61a0f1307485a964d1c5fda24f54e4108638b24e65344b2c03af21e5cdccda73004995afd7f4f333bc51db63c99528333008c43bc7394abf7839e4d1bbb
 EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.7.ebuild
index c9d0b3047ab2..51103d1e3841 100644
--- a/app-editors/vis/vis-0.7.ebuild
+++ b/app-editors/vis/vis-0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
 	test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )"
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="+ncurses +lua selinux test tre"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"