gentoo resync : 25.11.2020

39 files changed, 492 insertions, 322 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 4e71302a8eaf..6ec8b17a8384 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 630af3a89ff4..ea58ed45eba4 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -1,6 +1,8 @@
-AUX dav-0.8.5-asneeded.patch 318 BLAKE2B 1556f43aa48931c2687defc85d0b23b7a6519ff1f5c5ac0ce7f1cb0b7a67e19b75af0b97cf72ec5a6665aca386b8f44a0a44446623666bb16e76abae752b2ed3 SHA512 06ad6057354af941512e6c77f59cd9c30a7192c01fdce65d5d66e15fb99476429092f0587130162b78f22ca72354af8925735733c142a889a478c8a07384138f
-AUX dav-0.8.5-davrc-buffer-overflow.patch 246 BLAKE2B ef18f5ad8107e981c60f3bd3191cea342fb466cc9232294a88a29f6c2db37ce6ed846a66bf78722291540e0f813d7ce6ae939979352d370931fb5a43e12d5913 SHA512 36c8e336adc3cdb053af61ea53bf497073d197e67957f2ad011f7199c1518deb08f5fcfffa4ff14c49139f6bab01303332c8c15e5944245696dbc62dceff116c
+AUX dav-0.8.5-asneeded.patch 213 BLAKE2B 84dc034ab97c82106ba90887a66dcb29870a25f6fc3b6ec029d0b177383c226b101b54e65400e182236250644bc441b242cd52ee5c8c7c85e6d4e5ec284a3137 SHA512 ce029cd410eb9c0669e6cd822ca529eadd23d30dce94b2c2fddf10dd4f7637d3bdd58fd041bfdf7d1d750b4d7ed848fa77dd98c64885f8cc848016fbeb96f534
+AUX dav-0.8.5-davrc-buffer-overflow.patch 153 BLAKE2B bc27b0346dc69646b9fe44796f65c7ec399af56f0df278e1579927d05ef643cebbb8f7ce3aa294ba6b7340601088da05c0eb18e78548872babbf6b12d942184a SHA512 0eeb7c6a167a6fbcc60195f93d58ca28f7d98e7e24e93a9c314fb00a035ec83fb1176f52e6676d88ab1ad56e4608869f91ace672ab77a4291c94677f5e028e7c
+AUX dav-0.8.5-fno-common.patch 804 BLAKE2B 11e367e6870e1da6e0932ba933c09ae92b879f93a67830068c9766bff8c783891c5cc7cdaff8a01f4eded3fdd59a2d161cb5591084f172317eee03d1ee6fceb4 SHA512 c1255b35a7765716112bcab43f24cc6db1c47162633fb46365031823ae94f2afc29a9ec547467b360766a26651563b0f60813136350d52ed4fb3c6e90770a71f
+AUX dav-0.8.5-makefile.patch 413 BLAKE2B 4d700f345f144178c63bc382f5a443047225bd3d47ea453496107008fa7ced9a0853b1a80a348eac62d2200f20f2924777a97ee568b31dcbc0be6ed4417b621a SHA512 76a4b50795cc133d5fc3e5499bb143cf3c64d5c68d6060f5d081ab3b4a55f4a2ee43b3ecfd1e0e2b7a54140dd68458f96f5b9872f4cc64039d8bdf6990fefe16
 AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
 DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
-EBUILD dav-0.8.5-r2.ebuild 902 BLAKE2B 99aa64dc8347f6e68a7d2fb2b1de46fd0d40144e8d19d42b803d26b9e151d9e120002733dcc2bbb1cd51e8a5262b6d4f7b5ced63ba71060f17f2b2c8f5897d3a SHA512 dcceeeff71a8358517c25644fad9f9978c5b8f2509cca21705303f22355570edcfd46141a9c832d5fa76694e653e50703fe2b403d90288df01583636b510f519
+EBUILD dav-0.8.5-r2.ebuild 1066 BLAKE2B fad7344b1356f2ba60a8c16dd50d367aff440b01e673dfb55f93750c36e8eb5eb04a7bae811383b32109ab5145711e11c8ca8b338f035d45d5a6ae5357084036 SHA512 64add96221e236233e3a4865d94c8f4b324a92b11b22061e640af247479494047c93cdc8ee4ebeaf7e59a80ba169bd6991e85fbee77c2181b43e93b6da664974
 MISC metadata.xml 245 BLAKE2B 0994c9d498383d2c458a3135ca07a8637acc6a2a89547ca1e245bf6354e61cc761e17d1eb33beaaab8c0c30997bbfc5772565212d7f58faf6cbfdaaf082025e8 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
index b04dad5486e8..bab3b72d4bdf 100644
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ b/app-editors/dav/dav-0.8.5-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A minimal console text editor"
 HOMEPAGE="http://dav-text.sourceforge.net/"
-
 # The maintainer does not keep sourceforge's mirrors up-to-date,
 # so we point to the website's store of files.
 SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
@@ -15,18 +15,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-asneeded.patch"
 	"${FILESDIR}/${P}-davrc-buffer-overflow.patch"
 	"${FILESDIR}/fix-Wformat-security-warnings.patch"
+	"${FILESDIR}/${PN}-0.8.5-fno-common.patch"
+	"${FILESDIR}/${PN}-0.8.5-makefile.patch"
 )
 
+DOCS=( README )
+
 # Makefile only
 src_configure() { :; }
 
@@ -37,4 +39,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
-DOCS=( README )
+src_install() {
+	default
+	docompress -x /usr/share/man/man1/dav.1.gz
+}
diff --git a/app-editors/dav/files/dav-0.8.5-asneeded.patch b/app-editors/dav/files/dav-0.8.5-asneeded.patch
index 75a43c67f43d..92bc6ebfdacc 100644
--- a/app-editors/dav/files/dav-0.8.5-asneeded.patch
+++ b/app-editors/dav/files/dav-0.8.5-asneeded.patch
@@ -1,6 +1,5 @@
-diff -u -r a/Makefile b/Makefile
---- a/Makefile	2004-02-22 02:04:07.000000000 +0100
-+++ b/Makefile	2008-12-30 19:31:19.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -12,7 +12,7 @@
  LDFLAGS=-lncurses -O3 -Wall
  
diff --git a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
index a32e78ebc818..7287d36cc604 100644
--- a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
+++ b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
@@ -1,5 +1,5 @@
---- dav-0.8.5.orig/main.c	2011-01-29 14:16:53.537725568 -0500
-+++ dav-0.8.5/main.c	2011-01-29 14:20:45.139125094 -0500
+--- a/main.c
++++ b/main.c
 @@ -327,7 +327,7 @@
  void loadSettings()
  {
diff --git a/app-editors/dav/files/dav-0.8.5-fno-common.patch b/app-editors/dav/files/dav-0.8.5-fno-common.patch
new file mode 100644
index 000000000000..df58fa36098d
--- /dev/null
+++ b/app-editors/dav/files/dav-0.8.5-fno-common.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/706846
+https://sources.debian.org/patches/dav-text/0.9.0-2/gcc-10.patch/
+--- a/main.c
++++ b/main.c
+@@ -58,7 +58,7 @@ char displayWholeScreen = 0;
+ struct buffer *buffers;
+ struct buffer *currentBuffer;
+ int currentBufferNum = 0;
+-
++ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
+ 
+ int main(int argc, char *argv[])
+ {
+--- dav-text-0.9.0.orig/main.h
++++ dav-text-0.9.0/main.h
+@@ -47,7 +47,7 @@ void connectLines(struct line *baseline)
+ void determineLineNum(struct position *p);
+ void countTabs(struct line *l);
+ void determineCursX(struct position *p);
+-ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
++extern ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
+ 
+ extern int maxY,maxX;
+ extern int helpBarUpdate;
diff --git a/app-editors/dav/files/dav-0.8.5-makefile.patch b/app-editors/dav/files/dav-0.8.5-makefile.patch
new file mode 100644
index 000000000000..8ff62de305ee
--- /dev/null
+++ b/app-editors/dav/files/dav-0.8.5-makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 8b1ff0a..7a57840 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ OBJECTS=main.o \
+         buffers.o \
+         fileIO.o \
+@@ -8,8 +8,8 @@ OBJECTS=main.o \
+         undo.o \
+         move.o
+         
+-CFLAGS=-O3 -Wall
+-LDFLAGS=-lncurses -O3 -Wall
++CFLAGS?=O3 -Wall
++LDFLAGS?=lncurses -O3 -Wall
+ 
+ dav: $(OBJECTS) 
+ 	$(CC) $(OBJECTS) $(LDFLAGS) -o dav
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 4dc3d5934b9c..e8dd8bae07f9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,12 +8,12 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
-EBUILD emacs-18.59-r13.ebuild 4354 BLAKE2B 0c7713a041659ddda2794957a830532fc31ad9a4dca38dc3f662be580f4f4a24b97e8c7de6cbbd5230524934e2e7d59f5aa263815996e3c51343504a4701f237 SHA512 97c565fcd3d4dab90e1967ec071d93a993aacfdac020137b19e7b063b384aadb86f2131aa45a48fff4b8730427b9d81fd51f9d4b66a3dc0334deb2fb0c21f4d6
-EBUILD emacs-23.4-r19.ebuild 10987 BLAKE2B 9837cedc2675773c59e583f40f4d3bbcdeac64235912569638e7aa879037b0d53a38fd25e81698f8993ce822562cb6ce9f3f6b8f6a404945caab9dec24c3cbe9 SHA512 dfa1b140f5ba8d9787d2e2b3a4c183c1657faabb73c4973aeaad1d911c293ead947374b674ae80e782d1b437a9d69ba574a0b231d2f6e30e72c18291e7973f17
-EBUILD emacs-24.5-r8.ebuild 10839 BLAKE2B 71f333423f8399ff9a4eb343d5c521c24f43705c84819d671396c90d94f691a13047afba7880e09d71a586110f1a2a911327c4d6b3fa3ae9e98ba924c2cbfc29 SHA512 dc1f984e87cc347dcc8708ba4c52d1b66e031ac19c0e203df28e940e64ac02aaca56c978d1cfbf553d7ddf3847a67c8ee54888f4beb1d0cdd7534035ce264c90
-EBUILD emacs-25.3-r7.ebuild 11181 BLAKE2B 1db9d77454b1390a8747b5cf63941554ec2e88430b13d36e95c2ba050356fdcc0084fec2c7b0b1320e206d901626e736c23e83911dd0ffe93d85d4370179fb1e SHA512 dda6dbfa227997eafa93d363779162b074766a9313774cd4aa4006e605ad9967f86f61b27d0b817d01afce9cc3148c40f63cb47dae9f1267122512cdc37454d1
-EBUILD emacs-26.3-r2.ebuild 11968 BLAKE2B 60a9d7c23bf25d6c1a8d6b8d65c3689891a86756d2b0ae2dbad1ff3671afdb7b2dff60eb0e2863bd834480910f41e9a3f04bd20368158686a64ca3281623defd SHA512 ca3729faa843ee6e7f0ca7140c9cc8425b1a62e98a2fdd2cb6ced64afbec0bf5e84fd0e1a8dc990de0f85cb53ad3ed4efb8faed059246f5aa7b3539083851763
-EBUILD emacs-27.1-r1.ebuild 13513 BLAKE2B 1bc8d27d10cba67c9201ce3dc76111cbb5a57d98e1637661e45af3b58d98d48ea5ed22c13d8f7f19c91aaef6ee68dc2323c5c3d6ab38dddca113320c96069239 SHA512 02316ba347aaaa2ba0bff764dd87e99d5cf49e0f8dc604ee57b8a7acb69c27a315dd76cfcd1a83ba957356c1f3ec45338d36850a3008511ceef6aafd082d4559
-EBUILD emacs-27.1.9999-r1.ebuild 13477 BLAKE2B 0331ea699d68acfff608efcc88f367e30633c0b115a04ed24328325786fb06730d7b063996a2b85ab01a74f8d790edbd706a8d6dc49e4f6ccab6c4d793e5c0b2 SHA512 e26cf52c1e67c57a9f9dec311a45e0ff6d8531e75774e55790bdeac257b9e03f189eeaa5ba82e09856e2ad892f0e4355e3f5010ee29812ec5ac99e6c3839de37
-EBUILD emacs-28.0.9999.ebuild 13448 BLAKE2B db0e9b950299594bd63f8a5b755bb52f8dfc47cbb10cca4ad71638d80e06bbbbb88e42bc5ec5c04ba96e86d56c2165a9ce153768dfe7be42462a5e67f50d837e SHA512 3cf9cdcb2b176472a0402d365119f674637a1218b35adab9edc14d67ce9e57d674a9932831b47e4367ff14f7f3efa74165b7350f0ca8a8971910a090aebf516d
-MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
+EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
+EBUILD emacs-23.4-r20.ebuild 11175 BLAKE2B 81160f566444d92fc5ea43f78334590e94a22facf875a51b55e932e460dcf8d09aef6a338e207966ac95353f79ccc639e6aea6021bcd1d6a96d30a5877ed388d SHA512 32a5899626ad5fce7067df0445458af251a5ff14e9bdece643c7784770e576600c0670cbdb588e341d7e81799a45186f35554e20ce5d8a2ef910b2f12a623b62
+EBUILD emacs-24.5-r9.ebuild 11045 BLAKE2B 9f96003288deb53fd79f259d7c84c2daf95fe501e8183684c0a4ddff1ddeda0fb6e2a2e224dce2ad8df573ada00d9c7ba1ae8d0ad26cb926a51d4b86780149ad SHA512 17038fe4cd88fcb220d23eda3c22a498639af4b05b0d3da38b2b5eb3b4a210c6aef9cfa8b6cd3fcf5830ac7b422533b3aeaf1b9c65edcd0a7502a860717e0d51
+EBUILD emacs-25.3-r8.ebuild 11387 BLAKE2B aa940b1226a213ae9260db0517ad9e7da2a4fc2ddeb5d2d08414f36a207ee3089fb109f603496511865814848f016d4a40d4699085af25640c18c27f5da9289d SHA512 b55fa576211fd48ddce54f9a8b4718c81ec6d425fe895fe97f44b4f5c74ddbad84ffc920eed7140c6b1f234de134d7643cf91c7e98030d761f8cad000c4bdbbf
+EBUILD emacs-26.3-r3.ebuild 12205 BLAKE2B 79b910b2bb1e50f52ee2af4b8b3099a96eee2d37fa268daf551ceb7da87afd6bf2da0b126e4a223bc714dc5beb473e102465c5bd8d295bda8abe6169647175f1 SHA512 86f2afa0d62bf84952eb4a16052a9779b87595025de6cfa2c4d118b362ae56b3510f56c942ee7508d8897c1514e38c02d759230a64bb73c8d280060009326b50
+EBUILD emacs-27.1-r2.ebuild 13750 BLAKE2B 3c6cc5c865676e09d7902637b76106148f5a2cf7f64cd47056401e91421668a8b9ab162d9e0e47cabd155f7d8451e576e06c84a1937ad173b300578b6795adf1 SHA512 37316aea5e8c4fbfcfbfe61e01edba0cf137f76d5b8ceba40c4aff32454f91cf9f5724f2682481ee3b512e4b75d7d224be7fd7f94b26a66c552893b5f370fea5
+EBUILD emacs-27.1.9999-r1.ebuild 13714 BLAKE2B 156f0487d366dffffa9ddef9647733f59842bc6ce0078f746b70e5836722911e8f7b10f3b6dc4e96ce0e388e25d5faf56c059dbee9b7b99bb64ef2103571acbd SHA512 d9173643778778a0c6e721a924a6e26ea8fc29dfb7f2c5de359d82402fc7a9da1800efd2be906e7270807004140a37c59c1f39429711b9769c1a2dd44e8b18e6
+EBUILD emacs-28.0.9999.ebuild 13685 BLAKE2B 95c15cb3aba782ed60b393e23f29d2d6d7ed79fd37711fc96f8d24080a287900e1f8f6b01ce3c22746ea3395f838ed524fdb90006844f1a665f2c140078e51f2 SHA512 32ad801c80e322b5112bec39de7d7b0bd9bcc12654c874b54cc189d029e5fd683af20b06e9c28eea72bee9def032bc8af7658a8b0720e7bc68c695f1d9fecf56
+MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51
diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild
index 4f56535c58dd..8b1d8fc4bd28 100644
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic multilib eapi8-dosym
 
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
@@ -123,7 +123,7 @@ src_install() {
 		yow env server
 	do
 		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+		dosym8 -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
 	done
 	for i in test-distrib make-docfile; do
 		rm "${D}"${basedir}/etc/${i} || die
@@ -135,7 +135,7 @@ src_install() {
 	# move Info files
 	dodir /usr/share/info
 	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym ../../info/emacs-${SLOT} "${basedir}"/info
+	dosym8 -r /usr/share/info/emacs-${SLOT} ${basedir}/info
 	docompress -x /usr/share/info
 
 	# move Info dir to avoid collisions with the dir file generated by portage
diff --git a/app-editors/emacs/emacs-23.4-r19.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index a7ebc3b34702..7817b1255749 100644
--- a/app-editors/emacs/emacs-23.4-r19.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -16,7 +16,8 @@ SLOT="23"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
 
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	kerberos? ( virtual/krb5 )
@@ -249,6 +250,10 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{applications,icons}
diff --git a/app-editors/emacs/emacs-24.5-r8.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild
index 19dd854cd077..d205fe64db89 100644
--- a/app-editors/emacs/emacs-24.5-r8.ebuild
+++ b/app-editors/emacs/emacs-24.5-r9.ebuild
@@ -15,7 +15,8 @@ SLOT="24"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
@@ -229,7 +230,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
 		|| die "moving emacs executable failed"
@@ -242,6 +243,10 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{applications,icons}
diff --git a/app-editors/emacs/emacs-25.3-r7.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild
index d54d8a9d32f4..2deef88cebcf 100644
--- a/app-editors/emacs/emacs-25.3-r7.ebuild
+++ b/app-editors/emacs/emacs-25.3-r8.ebuild
@@ -15,7 +15,8 @@ SLOT="25"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
@@ -238,7 +239,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
 		|| die "moving emacs executable failed"
@@ -251,6 +252,10 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-26.3-r2.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild
index 764b1ea0cc7c..dc65014ec5d0 100644
--- a/app-editors/emacs/emacs-26.3-r2.ebuild
+++ b/app-editors/emacs/emacs-26.3-r3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -256,7 +256,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -267,6 +267,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-27.1-r1.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild
index 2f899ce692e2..c0a8301900b1 100644
--- a/app-editors/emacs/emacs-27.1-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1-r2.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -299,7 +299,7 @@ src_configure() {
 #}
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -310,6 +310,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index bd826f2edf16..a3e4ddfa6837 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -298,7 +298,7 @@ src_configure() {
 #}
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -309,6 +309,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 478d84767fce..9ea17e49b558 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
@@ -297,7 +297,7 @@ src_configure() {
 #}
 
 src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@@ -308,6 +308,12 @@ src_install() {
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
 	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 0ae048b21bd4..1d93ee69f3e1 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -22,8 +22,8 @@
 <use>
   <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name="dynamic-loading">Enable loading of dynamic libraries at
-    runtime</flag>
+  <flag name="dynamic-loading">Enable loading of dynamic libraries (modules)
+    at runtime</flag>
   <flag name="games">Support shared score files for games</flag>
   <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 6fa022026f6e..d5ae3add9a90 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST gedit-plugins-3.34.1.tar.xz 978800 BLAKE2B 03225ddc414e172f08179c64fbf12d0282c131b71855ca9dc20ceaa5750a5555c7bdde8c4ff1d95c721177b3d379edbcfc9af19ec22b96942df1913d13560303 SHA512 7fe31c2b0a1381a44362bd6066422d182b2246e3f903f8cd83cde0467b9853620a445bea7878d93e95a0a71ac5d5dd081a1930d602007cf2a6ef00b1a45bebfc
 DIST gedit-plugins-3.36.2.tar.xz 980648 BLAKE2B 37f55b742258b233d161ce808483ba10f158b951f06eaee53d966edc275dad67a2d11eae342fed7bc9b185d1309c5795f645eabf24db99a6e6551a3dae19ddb6 SHA512 d46a5ec69f69838144333ca3e66abc7c64cdb3248877b38298f869027dd3bab16102957e723ad1b0d3c6af55745c2b7ce321949acb2575734c649a388bb0100b
-EBUILD gedit-plugins-3.34.1.ebuild 2750 BLAKE2B 31b530c4ab8fa64b5f7c847a514667e60f150533aa7b7ee3d74f157beead02fc11d984fcc8132ca95150cefe68c155524bd336afc2f1850019aa277ecfdbc6e2 SHA512 8af5c9214f9f020af53b87289f56dac82934db2c59623466a1e220d262596c441fdf859c3b4107f9c821665e6d3b177e1d98f54fffa88b34a7b2866130111243
 EBUILD gedit-plugins-3.36.2.ebuild 2723 BLAKE2B 08e057033afbb73771137966c7d343afa223ff0ae028dedefebc0e049cab781fc476c95fa139bf086df322b6229e0111cddadc7b13ca4fd00eb8ab3caf45f3d8 SHA512 242a3f7f43a1f42307bbd455045e5e394ba5ea9ac8b751fb901bd0bc4a5e01c7ced2d0f92b5c98eba394a4d1225c600e1c995b89af15c7ffe260fbe0fce718f4
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
deleted file mode 100644
index e6a56fa52f6d..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE="charmap git +python terminal vala"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-3.16
-
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=app-editors/gedit-3.16[introspection,python,${PYTHON_SINGLE_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		')
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-4.0.2:4[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplugin_bookmarks=true
-		$(meson_use python plugin_bracketcompletion)
-		$(meson_use charmap plugin_charmap)
-		$(meson_use python plugin_codecomment)
-		$(meson_use python plugin_colorpicker)
-		$(meson_use python plugin_colorschemer)
-		$(meson_use python plugin_commander)
-		-Dplugin_drawspaces=true
-		$(meson_use vala plugin_findinfiles)
-		$(meson_use git plugin_git)
-		$(meson_use python plugin_joinlines)
-		$(meson_use python plugin_multiedit)
-		$(meson_use python plugin_sessionsaver)
-		$(meson_use python plugin_smartspaces)
-		$(meson_use python plugin_synctex)
-		$(meson_use terminal plugin_terminal)
-		$(meson_use python plugin_textsize)
-		$(meson_use python plugin_translate)
-		-Dplugin_wordcompletion=true
-		-Dplugin_zeitgeist=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index eb3b77c276f1..dc959febb14d 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0
 DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390
-EBUILD gnome-latex-3.32.0.ebuild 1134 BLAKE2B d339878e8113de26c5f8bab86e471f5aea90bd294d6aeac745c70547089ed96a70f59354f28b29f5838508370d32f3458e21aa4aaf2b70c3a382f443db84d102 SHA512 d1b8e7bb41903bf47c7a87543c3dab4566a19fc51ce9edf1be7e90af2aa17bdfa3a43bdde308f33918941f022122897269718895ebb32bd4b182c934495f7400
 EBUILD gnome-latex-3.36.0.ebuild 1134 BLAKE2B e30477f51580d52b2c120334914b10ede09cae50eba5f19a4d9c2511a0f9096cc59df8edbbee252330ce640c046e066e78c34e054ea5c40c3a4b6fe582444917 SHA512 3f9d26de278eb082cb2d0452a9889d39c506996a30bcb63ee157160e6a7ebb32cb7b03ccbdccae4398b9eae78a3366cb05b2115bb0e95c33527b74e95c823ae6
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
deleted file mode 100644
index 61b5330ceff7..000000000000
--- a/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
-	>=app-text/gspell-1.8:0=
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/gtksourceview-4.0:4
-	>=gui-libs/tepl-4.2:4
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-	gnome-base/dconf
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--enable-dconf_migration \
-		APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0
-}
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 8aa748e09ee7..ceb068e92962 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,4 +1,8 @@
 AUX kile-2.9.93-cmake.patch 549 BLAKE2B f93414f3b09b45952a5082e9c9c0cd53b01b7b2ee3b080e6d4ef554cd3cbbf84f60061e1b4f9d1ab060f2e4ea221af3407140f9d897bece353691d9f262033e2 SHA512 be9a14c712c05bc63b1bf31eb959083580913c2ae37f642eab86f47a07f75d63d633fa154cce2ac65866b25da530cf0699e654c7b05ffc4361d35bc389a13faa
+AUX kile-2.9.93-fix-crash-when-deleting-templates.patch 1480 BLAKE2B 65260e42c42264d73ec8e18273a19f539dbd820cd8529212a346bcfbc83796736ac5cf4062b2787841791a65bf450735e1a45b5e3f9f3bd853cab90f6d78a235 SHA512 b9f8369f4d480de5678cb1ef1ed599ba1df06355d0cf63966185f989f9a92af81ec3d567d829a417dfc00d70eae22b1ec351041847b46fe72eb6f8a7917fe687
+AUX kile-2.9.93-fix-ktoolbar-usage.patch 962 BLAKE2B 05ef1605d01aabb40f2c64a8ec1c0212f442860add397ee85bd4597ec71ffdeb3120bd895e4a3b2e5bf02fdab15f75ccf9550e1c65aa6c8fd076aaa5e13f53e2 SHA512 06c8c2e0de25247edc0e2798b1455f1cd062d1f04c020a78f557958214b28b4228d56af57a1e154d1bb0598f22f9fe8e850d7b11f7ae9e569b15f89e95c43f2c
+AUX kile-2.9.93-fix-overriding-existing-templates.patch 6492 BLAKE2B 38b851368913d50aba95d5f037933fdd801be90921bfffc2b25fb2cca433c85806875f1472368fc9aace4475d9b24926bfe32ca5d4615ee83bbc728d402bc8aa SHA512 24cc76a554da0e25a37dc05356cf59224fd697278da8532ee2baaa6be4e04710620120545b11dd8a7986f56859ee9365fb072c1d3eaf6ef3fb4fcd5ed9543455
+AUX kile-2.9.93-no-khtml.patch 1361 BLAKE2B 01ab239474e4446368bd4a39da8e2f26f7cefc72f1150ea99a8ecf69dafc405fbdbc18d357da136f97ab446464a579a1d3e792f3d62c7c22a22954f6e6a7ab4e SHA512 2cc92a484315c61941ea19e73a5c98e0ae275a1475fd46bbfccb9f57283454f90d2b6a7e03da0a8e7f766c4486a4d1f6fef4b6c21b6349bc368ef14d936d9ed9
 DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
-EBUILD kile-2.9.93.ebuild 1717 BLAKE2B 06e3bb50cb1d6046ab51f705f82c7ef01d316376490cd61ed45a4f5180d9d46362f2c6004f947f55ec22b3489ef253c1f94fdbec358e71f2fecd492048218c1d SHA512 229a52d69a1b043e95786adacd56204153201c578d1a003759074d29500982cdf512885fb7239b061b356546ede8a86b81d630af2fe0aa47ae63a433f6443bca
+EBUILD kile-2.9.93-r1.ebuild 1880 BLAKE2B 5e21133d5523c4279a19df92f1c512eb4d584a8a0bb47a28667e7eef4e190c27d1867e22d2bfe0c5c346513567cd56b9bb9dbffa5b67e2b56905655111475d41 SHA512 51dc55144cbbd90593cd6ce897971b9cbb162362f9328de82ce29a94b35b33916aa0692196d86b9850fa1a2bda0361ca4528cab8be585ae4fbe4a195500a0407
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
new file mode 100644
index 000000000000..232bd3894833
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
@@ -0,0 +1,35 @@
+From 483743aa9f194376a8b496ac4e58a946070a36af Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 1 Dec 2019 09:09:55 +0100
+Subject: [PATCH] Don't crash when deleting templates
+
+BUG: 413506
+---
+ src/dialogs/managetemplatesdialog.cpp | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
+index fe6537ad..c5298b21 100644
+--- a/src/dialogs/managetemplatesdialog.cpp
++++ b/src/dialogs/managetemplatesdialog.cpp
+@@ -317,17 +317,6 @@ bool ManageTemplatesDialog::removeTemplate()
+ 
+     KileTemplate::Info templateInfo = templateItem->getTemplateInfo();
+ 
+-    KIO::StatJob* statJob = KIO::stat(QUrl::fromUserInput(templateInfo.path), KIO::StatJob::DestinationSide, 0);
+-    KIO::StatJob* statJob2 = KIO::stat(QUrl::fromUserInput(templateInfo.icon), KIO::StatJob::DestinationSide, 0);
+-    KJobWidgets::setWindow(statJob, this);
+-    KJobWidgets::setWindow(statJob2, this);
+-    statJob->exec();
+-    statJob2->exec();
+-    if ((statJob->error() && statJob2->error()) || !QFileInfo(templateInfo.icon).exists()) {
+-        KMessageBox::error(this, i18n("Sorry, but you do not have the necessary permissions to remove the selected template."));
+-        return false;
+-    }
+-
+     if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?", templateInfo.name)) == KMessageBox::No) {
+         return false;
+     }
+-- 
+GitLab
+
diff --git a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
new file mode 100644
index 000000000000..2afd0622ea3d
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
@@ -0,0 +1,25 @@
+From 5c268679da2fb2cdc414890bdd79a5592e37cb22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Tue, 15 Sep 2020 15:33:51 +0100
+Subject: [PATCH] Fix KToolbar usage.
+
+---
+ src/widgets/scriptsmanagementwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/scriptsmanagementwidget.cpp b/src/widgets/scriptsmanagementwidget.cpp
+index 79552da3..94f58f18 100644
+--- a/src/widgets/scriptsmanagementwidget.cpp
++++ b/src/widgets/scriptsmanagementwidget.cpp
+@@ -66,7 +66,7 @@ ScriptsManagement::ScriptsManagement(KileInfo *kileInfo, QWidget *parent, const
+     baseLayout->setContentsMargins(0, 0, 0, 0);
+     setLayout(baseLayout);
+ 
+-    m_toolBar = new KToolBar(this, "scriptControlToolBar");
++    m_toolBar = new KToolBar("scriptControlToolBar", this);
+     m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+     m_toolBar->setIconDimensions(KIconLoader::SizeSmall);
+ 
+-- 
+GitLab
+
diff --git a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
new file mode 100644
index 000000000000..f303cff0b0f0
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
@@ -0,0 +1,164 @@
+From 7a55cf2d93c9daa13f2fa2ec1ae25646507cfc0c Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 1 Dec 2019 15:56:05 +0100
+Subject: [PATCH] Fix overriding of existing templates
+
+Also, don't delete the original file after the template has been
+created from it.
+
+BUG: 413473
+
+* asturm 2020-10-17: backport to 2.9.93 (drop unnecessary string change)
+
+---
+ src/dialogs/managetemplatesdialog.cpp |  7 ++-
+ src/templates.cpp                     | 78 ++-------------------------
+ src/templates.h                       | 10 ++--
+ 3 files changed, 12 insertions(+), 83 deletions(-)
+
+diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
+index c5298b21..77d5d6ff 100644
+--- a/src/dialogs/managetemplatesdialog.cpp
++++ b/src/dialogs/managetemplatesdialog.cpp
+@@ -292,11 +292,10 @@ void ManageTemplatesDialog::addTemplate()
+             reject();
+             return;
+         }
+-        returnValue = m_templateManager->replace(templateInfo, m_sourceURL, templateName, iconURL);
+-    }
+-    else {
+-        returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
+     }
++
++    returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
++
+     if (!returnValue) {
+         KMessageBox::error(this, i18n("Failed to create the template."));
+         reject();
+diff --git a/src/templates.cpp b/src/templates.cpp
+--- a/src/templates.cpp
++++ b/src/templates.cpp
+@@ -82,7 +82,10 @@ bool Manager::copyAppData(const QUrl &src, const QString& subdir, const QString&
+             testDir.mkpath(dir);
+         }
+         // copy file
+-        KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL);
++        if(src == targetURL) { // copying a file over itself
++            return true;
++        }
++        KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL, -1, KIO::Overwrite);
+         KJobWidgets::setWindow(copyJob, m_kileInfo->mainWindow());
+         return copyJob->exec();
+     }
+@@ -130,77 +133,6 @@ bool Manager::remove(Info ti) {
+     return removeAppData(ti.path) && removeAppData(ti.icon);
+ }
+ 
+-bool Manager::replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon) {
+-    KileDocument::Type type = m_kileInfo->extensions()->determineDocumentType(newTemplateSourceURL);
+-
+-    //start by copying the files that belong to the new template to a safe place
+-    QString templateTempFile, iconTempFile;
+-
+-    if( newTemplateSourceURL.isLocalFile() ) {
+-        // file protocol. We do not need the network
+-        templateTempFile = newTemplateSourceURL.toLocalFile();
+-    }
+-    else {
+-        QTemporaryFile tmpFile;
+-        tmpFile.setAutoRemove( false );
+-        tmpFile.open();
+-
+-        templateTempFile = tmpFile.fileName();
+-        m_TempFilePath = tmpFile.fileName();
+-        KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newTemplateSourceURL, QUrl::fromLocalFile(templateTempFile), -1, KIO::Overwrite );
+-        KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
+-
+-        if( ! fileCopyJob->exec() ) {
+-            return false;
+-        }
+-    }
+-
+-    if( newIcon.isLocalFile() ) {
+-        // file protocol. We do not need the network
+-        iconTempFile = newIcon.toLocalFile();
+-    }
+-    else {
+-        QTemporaryFile tmpFile;
+-        tmpFile.setAutoRemove( false );
+-        tmpFile.open();
+-
+-        iconTempFile = tmpFile.fileName();
+-        m_TempFilePath = tmpFile.fileName();
+-        KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newIcon, QUrl::fromLocalFile(iconTempFile), -1, KIO::Overwrite );
+-        KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
+-
+-        if( ! fileCopyJob->exec() ) {
+-            if( ! templateTempFile.isEmpty() )
+-                QFile::remove( templateTempFile );
+-            return false;
+-        }
+-    }
+-
+-    //now delete the template that should be replaced
+-    if(!remove(toBeReplaced)) {
+-        if( ! templateTempFile.isEmpty() )
+-            QFile::remove( templateTempFile );
+-        if( ! iconTempFile.isEmpty() )
+-            QFile::remove( iconTempFile );
+-    }
+-
+-    //finally, create the new template
+-    if(!add(QUrl::fromUserInput(templateTempFile), type, newName, QUrl::fromUserInput(iconTempFile))) {
+-        if( ! templateTempFile.isEmpty() )
+-            QFile::remove( templateTempFile );
+-        if( ! iconTempFile.isEmpty() )
+-            QFile::remove( iconTempFile );
+-        return false;
+-    }
+-
+-    if( ! templateTempFile.isEmpty() )
+-        QFile::remove( templateTempFile );
+-    if( ! iconTempFile.isEmpty() )
+-        QFile::remove( iconTempFile );
+-
+-    return true;
+-}
+-
+ void Manager::scanForTemplates() {
+     KILE_DEBUG_MAIN << "===scanForTemplates()===================";
+     QStringList dirs = KileUtilities::locateAll(QStandardPaths::AppDataLocation, "templates", QStandardPaths::LocateDirectory);
+diff --git a/src/templates.h b/src/templates.h
+--- a/src/templates.h
++++ b/src/templates.h
+@@ -1,7 +1,7 @@
+ /***************************************************************************************
+     begin                : Sat Apr 26 2003
+     copyright            : (C) 2003 by Jeroen Wijnhout (wijnhout@science.uva.nl)
+-                               2007, 2008 by Michel Ludwig (michel.ludwig@kdemail.net)
++                               2007-2019 by Michel Ludwig (michel.ludwig@kdemail.net)
+  ***************************************************************************************/
+ 
+ /***************************************************************************
+@@ -79,15 +79,13 @@ public:
+      **/
+     bool searchForTemplate(const QString& name, KileDocument::Type& type) const;
+ 
+-    // add a template in $HOME/kile/templates/
++    // Add a template in .kde/share/kile/templates/
++    // This function will override any existing template.
+     bool add(const QUrl &templateSourceURL, const QString &name, const QUrl &icon);
+ 
+-    // remove a template from $HOME/kile/templates/
++    // Remove a template from .kde/share/kile/templates/
+     bool remove(KileTemplate::Info ti);
+ 
+-    // replaces a template
+-    bool replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon);
+-
+     // these have to be methods as we cannot use i18n calls in global objects
+     static QString defaultEmptyTemplateCaption();
+     static QString defaultEmptyLaTeXTemplateCaption();
+-- 
+GitLab
+
diff --git a/app-editors/kile/files/kile-2.9.93-no-khtml.patch b/app-editors/kile/files/kile-2.9.93-no-khtml.patch
new file mode 100644
index 000000000000..cf055fc84490
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-no-khtml.patch
@@ -0,0 +1,58 @@
+From 7c050b5e306cab115573aea1bfc951aaaa1203e9 Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Fri, 22 Nov 2019 09:40:53 +0100
+Subject: [PATCH] Remove dependency on KHTML
+
+---
+ CMakeLists.txt       | 1 -
+ src/CMakeLists.txt   | 2 --
+ src/kilelauncher.cpp | 1 -
+ 3 files changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bea621f..1b25e3a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ find_package(KF5 5.31 REQUIRED COMPONENTS
+ 	I18n
+ 	IconThemes
+ 	Init
+-	KHtml
+ 	KIO
+ 	Parts
+ 	TextEditor
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 77626894..e23480fd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,7 +55,6 @@ set(kile_SRCS
+ 	dialogs/usermenu/usermenuitem.cpp
+ 	dialogs/usermenu/usermenutree.cpp
+ 	dialogs/validatorinputdialog.cpp
+-	docpart.cpp
+ 	documentinfo.cpp
+ 	editorcommands.cpp
+ 	editorextension.cpp
+@@ -238,7 +237,6 @@ PUBLIC
+     KF5::Crash
+     KF5::DBusAddons
+     KF5::GuiAddons
+-    KF5::KHtml
+     KF5::I18n
+     KF5::IconThemes
+     KF5::KIOCore
+diff --git a/src/kilelauncher.cpp b/src/kilelauncher.cpp
+index c0bcdf9d..24a1f5b4 100644
+--- a/src/kilelauncher.cpp
++++ b/src/kilelauncher.cpp
+@@ -16,7 +16,6 @@
+ 
+ #include <config.h>
+ 
+-#include "docpart.h"
+ #include "kileconfig.h"
+ #include "kileinfo.h"
+ #include "kiletool.h"
+-- 
+GitLab
+
diff --git a/app-editors/kile/kile-2.9.93.ebuild b/app-editors/kile/kile-2.9.93-r1.ebuild
index e13393daca2f..23b5ae2d2557 100644
--- a/app-editors/kile/kile-2.9.93.ebuild
+++ b/app-editors/kile/kile-2.9.93-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KDE_ORG_CATEGORY="office"
+KFMIN=5.74.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://kile.sourceforge.io/"
+HOMEPAGE="https://apps.kde.org/en/kile https://kile.sourceforge.io/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -25,14 +26,13 @@ DEPEND="
 	>=dev-qt/qtscript-${QTMIN}:5
 	>=dev-qt/qttest-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/okular-19.04.3:5
+	kde-apps/okular:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdoctools-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kinit-${KFMIN}:5
@@ -44,14 +44,13 @@ DEPEND="
 	pdf? ( app-text/poppler[qt5] )
 "
 RDEPEND="${DEPEND}
-	!app-editors/kile:4
-	>=kde-apps/konsole-19.04.3:5
-	>=kde-apps/okular-19.04.3:5[pdf?]
+	kde-apps/konsole:5
+	kde-apps/okular:5[pdf?]
 	virtual/latex-base
 	virtual/tex-base
 	pdf? (
-		>=app-text/texlive-core-2014
 		app-text/ghostscript-gpl
+		app-text/texlive-core
 	)
 	png? (
 		app-text/dvipng
@@ -61,7 +60,13 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} )
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-no-khtml.patch"
+	"${FILESDIR}/${P}-fix-crash-when-deleting-templates.patch"
+	"${FILESDIR}/${P}-fix-overriding-existing-templates.patch"
+	"${FILESDIR}/${P}-fix-ktoolbar-usage.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index f1a534b5e294..7795d89c9468 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,5 @@
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
+DIST mousepad-0.4.90.tar.bz2 808320 BLAKE2B 5a639001663d24a9d0ae126f672adb5d3a72825893e0f0d90e263596f214d76f973e0743248efee8562dc04afb09c0519ed649ca5d36b9221569490e289d687f SHA512 e839584782b09ee9d485ca4dcf05e22afb459cba269b3a15fe2dc0e3f3240bc15b1a8d7db92160b735d97d7293e67b0484b50ac3e72946b499dc65ac1097390b
 EBUILD mousepad-0.4.2.ebuild 1147 BLAKE2B 05c61f59b02d3fa600143f96e3135e4f0d4e3b7b2bb22e83005120c095477018dac9fac4d6895a7e01ff06a24edcf40862236ba3202898637446239b8e79c5e1 SHA512 91532dc7048428097cfccfa7b0444ef39a00cdd859842ec01d20029bd5fcab4e8baf3eea0993b0a7f29acb8fd00c40f7c57a9db7d69ba619c0c41a28f10b83fb
+EBUILD mousepad-0.4.90.ebuild 794 BLAKE2B b605fdbc5f0162763ea0944a55550221eeaa53c5886db3ff7528bba3e6314c37db6dd0e3c28ece1bebc19cb825bdcc559dcec8007e4043d93066a8ba0d3a11e9 SHA512 e48fad969fb5742577a300bba23fd9b3bb6651e8b722d819faeb2fd185e9e1b87807ce137dff26c97752db86ef2c7a68fa41a17abd9a7490a65bbc6b97c4c6ee
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.90.ebuild b/app-editors/mousepad/mousepad-0.4.90.ebuild
new file mode 100644
index 000000000000..8d5d963fcc26
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.4.90.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 c88d869f9c2a..bb72c94e20b1 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,12 +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.0.tar.gz 3034734 BLAKE2B 03ea59c97c0e421ed92f588a2e6991f968b2f341761db66fda077ab827d00b9eb13930f08011f0028010e2005bb912ead723928b482a0532e924f85757a75569 SHA512 7e650676a15a185a9695eb49ae5cf441e3d42ae13817a9d3e64cb347c795840712778ac464fd5c578cc6464132206ee06dba52a06a218bcc865485ce3502a4bb
-DIST nano-5.1.tar.gz 2861977 BLAKE2B c826782683d26b4c27ffb82e8c4dabad543fe93f53d942bc6ad57b8acb7959595986216a1936d69b0a63b72da101de2c886995421db93c76ee842313799de78d SHA512 8007f40f27a1235d59f5559b6629a3a5a1a579a2356c8825dfef121f4ba7e6c5196e4cedea441c7e856f9add1e9739b14b4142a0a14dab90841110218149df11
 DIST nano-5.2.tar.gz 2865091 BLAKE2B 3822b3fd8dede897d698401a06ea0b4b49bf39f48d16c750e273007b1795a8adfc71654eadc08039a5c6999973ff7e70148b4c720b32a8f361424404e3c2ff3f SHA512 4c77bcfdf704a7882e944cb6d4cd571b698447500255e5701d30990def56cec0c396a33c761b8149f3cc4208a8dcd0f39372804d54cbe6bc2db9244f4a2259b3
+DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
 EBUILD nano-4.9.3.ebuild 2334 BLAKE2B a46bb4bc1a3cb5d62c0f7db03c7ad1785d168daae307275b198e7f4527d98d84c7b7557ee1cfe2f70e4aa5e60f8cda4abb5fd8261decdcd4f7ff11f54f25e686 SHA512 a8dab8ae77a332ca5576b907e8a73fd288f3da0f8fdd4c2d52ab4e747c911c30425b81db7958a6b3a256ce4b1a2d6a480a728991e67b66d6d09434f36aaad1ef
-EBUILD nano-5.0-r1.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
-EBUILD nano-5.1.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
 EBUILD nano-5.2.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
-EBUILD nano-9999.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
+EBUILD nano-5.3-r1.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.1.ebuild b/app-editors/nano/nano-5.1.ebuild
deleted file mode 100644
index 86f22534c12f..000000000000
--- a/app-editors/nano/nano-5.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
-
-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
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-5.0-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index 86f22534c12f..58e6b0821478 100644
--- a/app-editors/nano/nano-5.0-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.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/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 86f22534c12f..58e6b0821478 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.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/okteta/Manifest b/app-editors/okteta/Manifest
index 1a379eb1601b..b9ef59106cb1 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,3 @@
 DIST okteta-0.26.4.tar.xz 969572 BLAKE2B 37f3a0c83c3a922030816813de9a66edff0f4a1ae9f3450f9fe195b52d1b053c23f37c8fb2a06b08ef8df47061123536f202809b3d4954d824103dfb1b912559 SHA512 2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7
-EBUILD okteta-0.26.4.ebuild 1771 BLAKE2B 32a6c29bc2f3bdb8cbd607c78c6f74007ec5997d6819ac2b4e6ba687440f501e6985c554dc8d3409783cb96b83d8ee1120fa42f7e0e43f1e2d0ef40baae28fe0 SHA512 e9f070af1cfc2969620dfc79232308b9cd0b4e9675d309cc78f049d0f457f8652f386f10133373f116a9eb655f43aff7372c9e84454805e8469aa7316b35f2fb
+EBUILD okteta-0.26.4.ebuild 1748 BLAKE2B 2dde9f4114d76cf744609ee57879ddcf4a4d1a7cddba1ee11a954c4bab2f07d8abf36970c333c24e9db73281bb764210cbfda67bdc1787bbfc4be3a1347258b1 SHA512 843900a57980eddaa49d34ab1912b34868a0020e5d4243aa2247fda2883128336a7cbb037b755164200cf53843b6221f8512c5108e38873e178021038427917f
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.4.ebuild b/app-editors/okteta/okteta-0.26.4.ebuild
index d7762d4f7757..8499c3c2e99b 100644
--- a/app-editors/okteta/okteta-0.26.4.ebuild
+++ b/app-editors/okteta/okteta-0.26.4.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.okteta
+HOMEPAGE="https://apps.kde.org/en/okteta
 https://utils.kde.org/projects/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/app-editors/sandy/Manifest b/app-editors/sandy/Manifest
index f48cfca12517..475c043d66c0 100644
--- a/app-editors/sandy/Manifest
+++ b/app-editors/sandy/Manifest
@@ -1,4 +1,4 @@
 AUX sandy-0.4-gentoo.patch 1019 BLAKE2B 8aafad7b55d55fee1e48105f77b321929e306341cb318a89cc500089249988de33fba50a67a24a7868f1d6737a3130717cd38b40a132a28f36da1e1248da4053 SHA512 06e3e4dd2979e3589f9f1205eee13c56006ea4f2d8d8ead61faadebcdc9b590c82b645dc93b6ed6693cd15cd8d7e45491812fa3fb0819cfd088e5e231da7f7ab
 DIST sandy-0.4.tar.bz2 18409 BLAKE2B bb10bc7def440d436ffa0304c8f009d722b23159fdd8f2b559f768476391ba2ddda9083ef6fd7e0cec32b231d3c6fa9578214e5027b8a4cd490d338b384ea83a SHA512 6f28588e15ccdc467dd9d0de8b221508333defefe5866005d82292583db9f296284f233271af5e85b648c194dff117f94752cc364ed6c1409dae5c3af755b530
 EBUILD sandy-0.4-r1.ebuild 749 BLAKE2B c7b400388121ba9e0fe189c77acda73b56f6fae519a39ae39f494bc6082c37bad46b2c10e240e7ee4d4e4967e1a50cfb03c87ece7e7240b9456040f0de17e8f5 SHA512 950c9417523e97699628ed114d8273e8ff52517f760dc4eefe920f52165dbfd61b99f5d5e38877aa236797353ed3276b4517c0727291d2a73aaf2076217af7af
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/sandy/metadata.xml b/app-editors/sandy/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/app-editors/sandy/metadata.xml
+++ b/app-editors/sandy/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index 56e05d6df902..37c2dbb3a09c 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,4 +1,4 @@
 AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae631f709b651519298af624d6a9a28d13ebbe03f707351c9d51bebee2a198d35b8a8e709d574a99f751521dd SHA512 8cdc834a2d0d8d843e326a825a13418c765079ec41c15f1fe5b7a3eb2c158928db594ba7d7e946dd72a936af4bf86a302dd5b042fad64d20fe033f2b64dea3e8
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
-EBUILD texworks-0.6.5.ebuild 1456 BLAKE2B 54f5dc85c7178439ec0e8f200659e48cbfdd2c254cc023fc58b8efc46698c2cfab4ba48d6c31e4814ebf1f00a7fa330578b008b04f3bf39e42020a59562ee799 SHA512 aebe4a7c79dd8bcb06ed3d7f5adb238b7bd716a95aa17c1d76cc59c83937e1e53a5103d1963cef9058c892abae0abda5201c72811d45f0c5fde545298615e982
+EBUILD texworks-0.6.5.ebuild 1481 BLAKE2B 50e5b2f73baf61f5e65fcfc12a2358d288d71884c0e5341a0bd95a3bd0159b506bb47be1654f5bd47fbee02e10cfd50f1ad65b272f32eadb87e7c5bb20e33ec3 SHA512 2beea7a02dd41c53e4a592dc9aac000abc1f6a0bc3cceeaf1ebe088dfcda26b8ee26719ff5290372329a3e5c168ebf27156ba7dfb8298e27c41001fd3b1faf3c
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.5.ebuild b/app-editors/texworks/texworks-0.6.5.ebuild
index f9228f2ac586..49609fec4e86 100644
--- a/app-editors/texworks/texworks-0.6.5.ebuild
+++ b/app-editors/texworks/texworks-0.6.5.ebuild
@@ -28,7 +28,8 @@ RDEPEND="app-text/hunspell:=
 	lua? ( dev-lang/lua:0 )
 	python? ( ${PYTHON_DEPS} ) "
 
-DEPEND="${RDEPEND}"
+DEPEND="dev-qt/linguist-tools:5
+	${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig"