gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-editors
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
89 files changed, 613 insertions, 1329 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 9ea0cf025402..28bf8c5e5be8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/amyedit/Manifest b/app-editors/amyedit/Manifest
index 806a0fe7058c..b73a23f19a26 100644
--- a/app-editors/amyedit/Manifest
+++ b/app-editors/amyedit/Manifest
@@ -3,5 +3,5 @@ AUX amyedit-1.0-keyfile.patch 2123 BLAKE2B 0993a38d306a58b2aa020ba010baab9dfb12b
 AUX amyedit-1.0-signal.patch 3142 BLAKE2B 3df4279c6fa734033604ca1fccfa9ae01b025f465b788bd29cc32f536c4b3d5b70468a9c916a0acb959959daa1967d151f67884846559fde0fb768039e856015 SHA512 b288592a941af8e7be3897f88dd51911560bb60e702a0a846eeca77b2d116b393e2a5bab278c2264a555e6b273a38ab972050db842d37fa958e3fc78e09d5b5c
 AUX amyedit-1.0-sourceviewmm2.patch 12144 BLAKE2B e2e85fda6e08341be23dd470b0f9bf7c60d3789443a4462ee20d8c3a1b02d0e6df96165840bd2432ccfc242c147562ad3029ac35a36c63dde5bcaf9c8aee96cc SHA512 4c17617635765050edb64676f61a9d801747a50b38b66d4bb2dcf528e6ba10e4375c72008b6f84d620d2ffabe647dec33a51fa1c950be1179456df4eb0db1070
 DIST amyedit-1.0.tar.bz2 297769 BLAKE2B 9b3640db7f56bc6e5481b46f760e682cedc860e9439a55edcd45b9f1ec0a8dbead3f8f1075c2613da9842a590b56375fde8b3d36c98c813d400960a4d98fdbda SHA512 dce101c5d356cd194703798002c29772b7b7339a97f683ba7459e983988f26722f800a2c36a0c36bdea70a35c8398bc55b5215b4c30779ca22b5f25bbfedbe09
-EBUILD amyedit-1.0-r3.ebuild 860 BLAKE2B b9432c96406c103b27d43f793f14883550c06ad3197ed37945f4255a5d0b3d38c8fa7600e8983e486ef45741c97598f96468357415fddc4119fbe4e5b0fee7bb SHA512 2371feb80d8e26e6b592281c4f87ebfb3f2e32103af4b5a745db2076cd2c128a68e3327a1cbcd6ec20b15c154512b156148d23e248fe0b8c58a7c10b6c2b40d6
+EBUILD amyedit-1.0-r3.ebuild 860 BLAKE2B 8c953414e40480eb56a5df16ea90b39107aa4f410dd9393a3a078983df174475df0c5114f60a58508239dd443e6c4a275dad43127f22767d86e1bb8874a45481 SHA512 4c541c5f07acb0806a707cdf7288bed96230c742cf87ce7ce1490a6d533dfa95db13de4e7da96460e2dd06305c60014af44b62be561ada96e875ad8afc9426c5
 MISC metadata.xml 336 BLAKE2B d268a52e6363ffccd9760188df301cde94def002e716452837b61e396192b1e934a671eaaf5cc4ae38e9e9b6946fb5ecf7350fb767a169a7a922d6cd116b4783 SHA512 93c12ff67fc6038a20615e27eaa2df0d9c02d4a9d15fa92e26ba4158872d60d9876e7caa3b0e970d90e86f5985f7f890f926ec6fc4420f06d53efec27db8e85e
diff --git a/app-editors/amyedit/amyedit-1.0-r3.ebuild b/app-editors/amyedit/amyedit-1.0-r3.ebuild
index 5a41b9a271c3..eefaf494464f 100644
--- a/app-editors/amyedit/amyedit-1.0-r3.ebuild
+++ b/app-editors/amyedit/amyedit-1.0-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils flag-o-matic
+inherit autotools epatch flag-o-matic
 
 DESCRIPTION=" AmyEdit is a LaTeX editor"
 HOMEPAGE="http://amyedit.sf.net"
diff --git a/app-editors/dhex/Manifest b/app-editors/dhex/Manifest
index d76954e117fe..6f3224f8e838 100644
--- a/app-editors/dhex/Manifest
+++ b/app-editors/dhex/Manifest
@@ -1,7 +1,4 @@
-AUX dhex-0.63-Makefile.patch 651 BLAKE2B 094e99a7bd7d8c09c5fbbecb85070505a0fe8ffb1bf83a1ec03f2a875cad316e6723ee969652389b962f3def7c2257af592682eb1b39b00fc2e6db2205a6d86e SHA512 80a938e81aef1e7450410138ebb445541f9707a59add8dc25aa7ac7f0154d17d1adc4de1c4d72f2e933b9882cce545b9d13650e8e653f26cc38ee65ec7c6a685
 AUX dhex-0.69-Makefile.patch 506 BLAKE2B 5921fcc174c467e973cce08a0d11cb40e0d7dfacbb39834ec386a75d0a4473992ecdd2969b20eef2295ad9fde6ba9e09bbe212b29a36fdd17fe0d4dd0b85cec1 SHA512 0ab54c3c9df6bee462d34df8dc33d07a6cf8a91b64314d22cf0a433130e654c920f11172c9f7ba16a058e86bd0c59721ebc3b7c5706535c046977581f81f0117
-DIST dhex_0.68.tar.gz 58602 BLAKE2B c29d5af598b731bc415e2626e945253641ea61c8a744deaeee3f7a2e7b1636ccfb3f8b7696efd33d36fab59d59da408ff4f59b44a88a36a4d7afc27542326c9e SHA512 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421
 DIST dhex_0.69.tar.gz 57362 BLAKE2B 26bfeaffc65b0f3b0193ee940da3ad866ea1354d0e5bec021a68a6c515da956500bfd7561ba675d0a67526d09b1a72e8372ee7bb52ec372f2b59249313cf77c6 SHA512 76115fd6b67bf1f61af6acfbc4dac9ac54c14aeb291de6a190aa1ffa599cf8b3e40a422ed34c237cf1f5c7406b07e38e38fb1c9c9dd36ce93d05265238060ba0
-EBUILD dhex-0.68.ebuild 716 BLAKE2B da44d04df93d839d0e2a09d6dbe637c9bbf2386b027c0a1c64f86b1b35c55e83b30dc226d7b711770ff7e0e4ae707216cdbc7741e1f09f5135d916aa0d2cba20 SHA512 038f4083ad3578eab56f87fbc042de67d6be67f8c8bbf0e2c20134ab9f90f64e43bdced4fb5a25f308c1e0d5565bed6227a6eeee71bdc710b7d17e4c11c147da
-EBUILD dhex-0.69.ebuild 691 BLAKE2B 6a0fc6ba44933cb5f726c1372de8ed13493531bb11c49683eb0c8335cb6057584cf6afe87760991862d080dc08f87155fc5b155b1cc9a0e2968f3ace94ff3218 SHA512 09e87a865b452f94ff0a002b528708a15b78293256ea00a1ced61519917d65bdda534ff5aa26df200c38dfaefcfeabfaf6c926b7285eefca00825753a428ac7e
+EBUILD dhex-0.69.ebuild 717 BLAKE2B f08eb240a419451978657948b789109801286a72bccdfce705740f3b04f55b4aa3ce81c5947d814f1057af8d18f2966d4aaf5226a884b791be819e9aa4bdeacb SHA512 adf1d6197bc2da9775448f8140004262713ab2754de8b06407e1838379c22cc5d24b1db9440f1d4b37383e0a7c783362a66df5240ee747ffe4764254d03d26d2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/dhex/dhex-0.68.ebuild b/app-editors/dhex/dhex-0.68.ebuild
deleted file mode 100644
index bce05d75ad52..000000000000
--- a/app-editors/dhex/dhex-0.68.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="ncurses-based hex-editor with diff mode"
-HOMEPAGE="http://www.dettus.net/dhex/"
-SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.63-Makefile.patch
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin dhex
-	dodoc README.txt
-	doman dhex.1 dhex_markers.5 dhex_searchlog.5 dhexrc.5
-}
diff --git a/app-editors/dhex/dhex-0.69.ebuild b/app-editors/dhex/dhex-0.69.ebuild
index 01e5fc5f6c32..653613c88304 100644
--- a/app-editors/dhex/dhex-0.69.ebuild
+++ b/app-editors/dhex/dhex-0.69.ebuild
@@ -12,11 +12,12 @@ SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-editors/dhex/files/dhex-0.63-Makefile.patch b/app-editors/dhex/files/dhex-0.63-Makefile.patch
deleted file mode 100644
index f99c9ff1bf2d..000000000000
--- a/app-editors/dhex/files/dhex-0.63-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN dhex_0.63.orig/Makefile dhex_0.63/Makefile
---- dhex_0.63.orig/Makefile	2011-01-29 00:19:37.000000000 +0100
-+++ dhex_0.63/Makefile	2011-01-30 17:13:51.000000000 +0100
-@@ -1,11 +1,4 @@
--CC=		gcc
--LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
--CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
--CFLAGS=		-O3 -Wall -std=c99 
--#CFLAGS+= -ffunction-sections -fdata-sections
--#LDFLAGS+= --gc-sections 
- LIBS=		-lncurses
--DESTDIR=	/usr/local/
- 
- OFILES=buffers.o input.o output.o machine_type.o main.o menu.o ui.o hexcalc.o search.o gpl.o configfile.o markers.o
- 
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index dec656982992..36ff2c3694dd 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -2,7 +2,5 @@ AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21
 AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442
 AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-EBUILD elvis-2.2.0-r6.ebuild 2371 BLAKE2B 207ee8ce046e58ca0a7ac6e814da6327baadc122166c2f94ac1098414866cca6e578c37e1de55e683d6b8df8579adedb3bd706c670c5910c2dced12f432e0125 SHA512 9924b57b3e8af4f63ccba31944d2437bdf17682108a8dab6ac0d8c62acf6be6eef8c4e122bc15d261051300c51386d918f44d87defb775d11f85e08291b7a1fe
-EBUILD elvis-2.2.0-r7.ebuild 2379 BLAKE2B d047b05b67280a760e1f68b4038f72474d01f0766e771fb9612bea83a5b4aee47dacb1c8b0abe314e8002c2c2087fd3d8499d9a5bbd1b000a3a820467a240660 SHA512 ca56ad2a9755edd734079b82f6fdc098afd90d6d9169ec24ca76aaebbc3e26f857d2a10d408d327cded56f25ebe67e408b6f38cbf4c5051697e68ee390dc4aa2
-EBUILD elvis-2.2.0-r8.ebuild 2498 BLAKE2B d4bde6adeb77e9386b615618be3c540e7ab6f064a33f7ef27e596b0622af65bc16e51b2b59226def21a6ed8b42db5e491a71176582f04020d3d21831e413d007 SHA512 3eb10a4529919f144465dcac49c8b99c13a1479979c6892a4201aa42a1279dcf39493f42f7c73007f413da49593d8b5c73ae1af0c2cd1a36c7d4717a28df5b94
+EBUILD elvis-2.2.0-r8.ebuild 2494 BLAKE2B c0d74a06a03caecd4661e13423cd4460c986836270e3856eccb6b469be5997a51d66858dc4408683c19d3cbbb63433182af2b2539f532298e7ec0cadb38befc7 SHA512 f6e4a8e751c14c514225be2c038d6a1aea89c59b61dffbc051aadc66e5118dd2a68194bdac8420b31022f09de8b94b008ed7b03ba8c2a72d7717136cafc59a7b
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild
deleted file mode 100644
index fba833b8c828..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-	X? (
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2 )
-	app-eselect/eselect-vi"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch \
-		"${FILESDIR}"/${P}-interix.patch
-}
-
-src_configure() {
-	./configure \
-		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${EPREFIX}"/usr/share/elvis \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x) \
-		|| die
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	# Use LDFLAGS
-	sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
-		die "sed 4 failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/${PF}
-	dodir /etc
-	emake install \
-		PREFIX="${ED}"/usr \
-		BINDIR="${ED}"/usr/bin \
-		DATADIR="${ED}"/usr/share/elvis \
-		DOCDIR="${ED}"/usr/share/doc/${PF}
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1
-	mv doc/elvtags.man doc/elvtags.1
-	mv doc/ref.man doc/ref.1
-	doman doc/*.1
-
-	# Fixup some READMEs
-	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild
deleted file mode 100644
index 5df218c1ee98..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="http://elvis.the-little-red-haired-girl.org"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris"
-IUSE="X"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	app-eselect/eselect-vi
-	X? (
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2
-	)"
-
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/ft2.3-symbol-collision-fix.patch
-	"${FILESDIR}"/${P}-glibc-2.10.patch
-	"${FILESDIR}"/${P}-interix.patch
-)
-
-src_configure() {
-	./configure \
-		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${EPREFIX}"/usr/share/elvis \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x) \
-		|| die
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	# Use LDFLAGS
-	sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
-		die "sed 4 failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/${PF}
-	dodir /etc
-
-	emake install \
-		PREFIX="${ED}"/usr \
-		BINDIR="${ED}"/usr/bin \
-		DATADIR="${ED}"/usr/share/elvis \
-		DOCDIR="${ED}"/usr/share/doc/${PF}
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1 || die
-	mv doc/elvtags.man doc/elvtags.1 || die
-	mv doc/ref.man doc/ref.1 || die
-	doman doc/*.1
-
-	# Fixup some READMEs
-	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
index c02af39932bb..969cfb24e3c5 100644
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris"
 IUSE="X doc"
 
 RDEPEND="
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e43005b29dfa..08b6fb93e033 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,12 +10,12 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
-EBUILD emacs-23.4-r20.ebuild 11187 BLAKE2B a5b86deb0354e9eb5e0f9f3fe7ff6f5545d08c57a4d49d02c0fec7a76220f2b802547bf2f03cb128bc09a8f427e627ac183df1233e52dadb8f06921b68c5f7fe SHA512 86f52c0913887569a2144567593c9f12da0fdd401bbe031dcd4cc71e4dca741bfd456247411e2926dc8bf3cf35eb12149aa1000b9de4d677194a59cdcf109fea
-EBUILD emacs-24.5-r10.ebuild 10952 BLAKE2B f78442de59bb8bb9f74eb1f385f5fe5c49ffcec22ef393a1d192ec7601a10d23bd03cc7754eef959925923a73da9d8f93a5ea5d61565c64bbde407f20061b6f3 SHA512 cc990fc972c31f546fec7790e676fb145419c8811d0e7392347be38a5b5c2c2db2eb0fe12ebbf7fd6df5d90af6492d6d1826fdcdbb51afb26e04d8311201540f
-EBUILD emacs-25.3-r9.ebuild 11294 BLAKE2B d91e7e58309724d4e67ff9ce635bc072aecd6819718c304f64b97b89db443621ff24359d08215067f515c52c2257e6f1adc96b5ea8459ecece6cec337b139613 SHA512 2d5e3230da7a8199fc5f37cbe7dfbef0f2bc8d4fb016e538c01c51fcb43e197ef082c738a67bff62d3654fbc0ec469e36dc2403de1ffe48c3ab02e2e5b69b2aa
-EBUILD emacs-26.3-r4.ebuild 11937 BLAKE2B 6c476148a4b64ba2cdfd0a9e4fa0e43c1158e53b96f86a9db4a4bb3e7f46dcca15723543223989f7922751ef9948b2a36c25e22f2b6b707fa7288b5026ce277c SHA512 13830b771697b0e0c2434a8e0a8a682df0e7b98302b8be99608893e991c09027622d8afa008801fa2d879ab473bda5257dec3e8abddd24307f306ffe7931526d
-EBUILD emacs-27.1-r4.ebuild 14468 BLAKE2B 6e7d1f0f683606860ede3302d12b50429628ea89467a5cee6a0541e056e18008bd72f13a2a1a94fe629e4856d13a9d4b7250411df2f4d44bd5be91177905d61a SHA512 ec485f98de34f025c3f6067cb3cecb6be6d747d893aca2b0a715704e2be65b2b89ca9a81426bfc67b64850250e53e6e53009a742af59fdce0eaa785801f3c68f
-EBUILD emacs-27.2.9999.ebuild 14432 BLAKE2B d4e939f233c39cbbe28d5767a0cc2ecd2e9929ef63a72d7320ccb5da44e1c6b6408b7aadc4b03c6ff22140fb524c31248c9106a6bc94d6c4eb96e85b235a84de SHA512 d3708129d8efef4a2e0a48e745c658cc2b41903182439e6f43b935b765d7a94cc48f128309b10ca019a6c3e6ed22bf6cbece181506dd89131f7b769e53e30c1f
-EBUILD emacs-27.2.ebuild 14433 BLAKE2B 61e56a9db363cb138943a89c3717964b538a56f0e6c788545547f208858e6799ac83f3b78ae834a9db863f1861b607598600a6e6b2924ce5c3e877382caddd30 SHA512 0a2498e4ae8120f9acfd4ac25437fc62b06b32cc955505828885418ad5b52d2fb567fc00a9fdd799c10952bde72d2f1b6c7cc804d4a8baeeb8b4de41c62a74ce
-EBUILD emacs-28.0.9999.ebuild 14015 BLAKE2B ed276c43441e72ef142738ad6b314238ff1955ba7bb814457a238f37b184bafee376f649a52e0ba9cb0ad3dc4e4b3ff39e278b076a6f491deb5959a5aacb51a7 SHA512 a1eb24df88a03795a5facbcef44382edd158515056a1a0a9c02b5169a65e917a4bb9e1487de3cd4ef5fb17f05b6cc77548f9ff93be1dafecac656e0d154c431f
+EBUILD emacs-23.4-r20.ebuild 11016 BLAKE2B 75525567d105ecb2c83bcec444600d21bd957074123593d0037e04a2c04e64d080bddcf62b51bb0adb01e0ac77ad46850ac77224806b0666bdf2b8805098d6b6 SHA512 1e028bc69c05f3baeb9eff225051423eb10f3514a4ce159b39592b746d1d4f6dc1d565141cade5abb67bd67742eb55f3402ad781aeff698a0aad824688a6d775
+EBUILD emacs-24.5-r10.ebuild 10781 BLAKE2B 8b7a7566ce2ee7fd9e9c8f58a1474baa814d5cd3591f22f8d64dad4e106ecc0b7a56efd14fba2f06af92cea9051ff736560050c723cc5304b8c5c33c47d0882c SHA512 9c71eedfc4407c23e88ad97a46c3cd057c41e01711efb70992ecb8f010f43b3352971728c14aa310b4a5d7caa5f9d869518eed9c249abe95fa3975f35b2cd740
+EBUILD emacs-25.3-r9.ebuild 11123 BLAKE2B c37b558de89ee524552c0521f09195bf80e1b01899fae53784319c5c0a35ab5f01fe4f98f268ab810fb4ea92b72a08beb124d558559942d6ad3548dd3d158dcd SHA512 e86b375cc44b087b3af65d2201312c418aa7a2c153e54378eab7e489bc809a2f86a198ae0b35b3d8b4018dc6824511a75585b6ab1fd90749cfe3b2fd3c097239
+EBUILD emacs-26.3-r4.ebuild 11766 BLAKE2B c21c37ea3b2d54b66590e3b228946856e7fe04697e3ec8b12026c3a038fde3fc0e0c6a55baf732b08c037faeb10e257c1ef21277a525d92060fb99daddbbd22b SHA512 a840ac0098909830145dcde4171e65c0c2118a375b3025620a14e86b2c16dd71902127540b71c176efcbdd92c86396340401775a6b9105ac3f049636feb10e13
+EBUILD emacs-27.1-r4.ebuild 14297 BLAKE2B 871fb31db52bda22a43727bc11df1adacd2d81ed6a4ceac53e21715ecf0765cf4e5aa90caafafbc47830da2c0a077d78946a5dd618ac3ae1154eba4c32d5526b SHA512 e6372bcb13e27a7fc7a7ef824d342cf9171f3642b58e515106481a011abe7f162e5d8c235cd77c995c6d1ed2cb6e2e893c1f8044b55ec6a6efee438b33bc5316
+EBUILD emacs-27.2.9999.ebuild 14261 BLAKE2B 4a4ed9d6506f13362c269e2f79e68f977a26a679e20ae3cf8c0de8cd9a9fb2660cfa2da3ca5c285f290a92307d6f06c9f4035c1cb441ee775fd6b27880bec3d6 SHA512 8e95b6ca5344a23b2c6c7ea59b2a74204493953ae698e8c10775be7b1ea8c9f0b25340ae963f3f02d22beadc279c7d30cb8613c845df2937b27bb4c7a208aa34
+EBUILD emacs-27.2.ebuild 14262 BLAKE2B 2c35f870febbf283e03481fa0f40bc7773637af45ea85748f406d155db582d7e52ee535ee28e42732d879960f7147157462c3b720c5effd338f452648b5995f6 SHA512 aaf72d43f1861c75230bdff4e8a416d69ee364f1537cbbcc6188d52439de4d4f42994dfc28fa75db876db325f0fe591c5a3a9f8358b74a6a56b24787ed120626
+EBUILD emacs-28.0.9999.ebuild 13844 BLAKE2B 35297dd18513e664e48408f0bd0a9fb027181e665f9aae8ed0a69276b5739c7ee430449628d0e7dad93952fa7094f230b9701158db6a7391d569e4fc2becf52a SHA512 af62749c11ce65beb52f645eed8e87786427c20cdae49b2728bf7b0eea0d61420242c9e12cf015050e444aca9dd71e1589ff88623f05b410882cced34bec1ed9
 MISC metadata.xml 3037 BLAKE2B fea30de2fe3c754253119e21c0f2c1023d4ac9c78ff0586fd5c427a8b44104ca620a16a8560de310afe342fd38e69be58781656ae45d59223d3e48d6510bb980 SHA512 07a5bf84aecac3fde3d6b0a698e875683f8479becc66037ba4d21f0bfef3e7d533331ab072ad1d5911cc36d9b5efdec979a3daafe812a5055139f8171d4ae6ea
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index 0d973f9bfa62..245667931c0c 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -344,9 +344,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
index 29a79f9eda99..3358010308c1 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -336,9 +336,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
index 046d2d03a3ae..2ef65527eeee 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -346,9 +346,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
index f8e6373953ea..34237af4f679 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -365,9 +365,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
index 84733a91bbc8..f7ad194e0efe 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -433,9 +433,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index cf4fb3cdad13..7f3c223e9ed6 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -432,9 +432,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild
index d7bfdd69550d..c3f5c07c1496 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -432,9 +432,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index f29bffb7c8c9..80e296098e70 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -416,9 +416,6 @@ pkg_postinst() {
 		# force an update of the emacs symlink for the livecd/dvd,
 		# because some microemacs packages set it with USE=livecd
 		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
 	else
 		eselect emacs update ifunset
 	fi
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index bbe68da8ca13..812ad272566c 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,5 +1,5 @@
 AUX fte 604 BLAKE2B ccb21ce020421a68d33fb94185d3acc6ad26f6f8cd0c574c9ca611aa923180e5192b6271312575f7a64f329d3e25d2722b07425553cfa57e54ed55ec3668f0f1 SHA512 5f93df643282016c352db88cddd37c1b9f86d94654a7eff0089b9d349ad3f56ba4266cb2431ac3a418bd4b5aebf6d7ad04c26099061942fd3e90fc9fb938322b
 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089
-EBUILD fte-20110708-r1.ebuild 2660 BLAKE2B 7dd117e3960a50a303c1bef1a7132873d867f351bb6e7e6f06a0f74e0adfdac40da743c46283746b0296281194edda685a338658c2d2142a4d066c5ea95a8532 SHA512 9758298e84d5bc0173d744eca0b6843188519b25a32bb9697bbeb6111217791b3e6076fec8cc67f6ee71760dae6001262f968a5679bfa35df3cd872fb6f8d946
+EBUILD fte-20110708-r1.ebuild 2653 BLAKE2B 7b2172266ee2da81096a32b0a62556f96cd56837f126fb40d1d09a1387040e217918df0e1a8cd3714fb92720ad90678ef6dd48ddad4e36ad028f340329299724 SHA512 10a904498159c9ec3508543deb651f0a406214d94a14c13b4b122337d73e034f0383720baa950acc06150d66aa31dc09651add49c719bb0fdf693fb526443a7e
 MISC metadata.xml 245 BLAKE2B ea33508ff29b4f24aab82fc591b95af9c809371cefb4753183be47cf8889e92312e0b84d27a78a666dd71dbd7ed681858333c8d69e916863bd06ba7b18230a74 SHA512 9b27222b0c0d858269d3ddd5449818170293bfad93ae5ed4687ad6aca27a73136efcdeb6bb99f604ab75d1ad436b7244556ab94bd0a4afcb4967e97db9b74e4f
diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index 2c849b33f9c6..96de0620957a 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs vcs-clean
+inherit toolchain-funcs vcs-clean
 
 DESCRIPTION="Lightweight text-mode editor"
 HOMEPAGE="http://fte.sourceforge.net"
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 56ad6bc3cff1..841bcdb79e90 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST gedit-plugins-3.36.2.tar.xz 980648 BLAKE2B 37f55b742258b233d161ce808483ba10f158b951f06eaee53d966edc275dad67a2d11eae342fed7bc9b185d1309c5795f645eabf24db99a6e6551a3dae19ddb6 SHA512 d46a5ec69f69838144333ca3e66abc7c64cdb3248877b38298f869027dd3bab16102957e723ad1b0d3c6af55745c2b7ce321949acb2575734c649a388bb0100b
 DIST gedit-plugins-3.38.1.tar.xz 957616 BLAKE2B 9cf5fe5343b513bd841add5d4e85f8fe2e8f62524af7c124bdfc41b81e653a41d1a7417f8cc06f764cca730927f471598cae914a1581c5cd3712b89c464a075d SHA512 d5cc3e82ac6a488f5ab06eaf4eb5ad32bdbe50b74f2f215e114b5cb3bb0a089da00caa3815d6638a679c1c902983a0754a16ef88e15ff88d8321a247288ad237
-EBUILD gedit-plugins-3.36.2.ebuild 2738 BLAKE2B d9128fd061c92b0dd3093b1d0b17982b2b5eeb459871f1dd44e7c60514bc0355368a299a2be2ebadf8a8f720d1fbc83e3cdf8149f7e6f31942f18a70876119ea SHA512 afd81300e5b836d5bc7f0fe6401de48ca90a323bd6772c929ea0ca59376c17a6ae6bb8b0e9d81e4651b889d0c3b3288b882ef07a24be449e9e5334ebb29f1e56
-EBUILD gedit-plugins-3.38.1.ebuild 2721 BLAKE2B bc6afa9338ec92bad95a254991f84384d1b4466323713ef6b1d6f71d46330d2e7d643f714ae8df2d523b56ee3031cd944d4510b71bf9549fcb7aead2edbae9b4 SHA512 fcaf350728ea38fb43c9df2c455d83338d9b9c322c03ba65bb7b6afcb8ba582d53d105293b5603fd1a1ece3492a51fda639a775aebee80ae7e835200957555e1
+DIST gedit-plugins-40.0.tar.xz 950560 BLAKE2B 783803dd4913a2b384a714c7564f18686b6ecf7da2f10d421322b6421e9b10271f97dcbf819e3212c97a0e4ba2b54dcb12ba5efc392396caafe705844e2cd407 SHA512 660e82dc1a1187262afd921196074dd2808a400b5acbc88ab36f522c50f1b9d221ff1821c2e8c0c066c7556862779e8d277f52a758070c59b17e6b53791ff39d
+EBUILD gedit-plugins-3.38.1.ebuild 2720 BLAKE2B f90c19d1c5ab039c3ec9797a643db60bc449dbe61710fa32c98bcf3961742adea05d21f1c824da5ffd27133f71b3c9e1f8e2949d068f4ce2f5aece114d8662db SHA512 432e71c98caf77e46e87080685f96e580a410ab9016922539e762a0ce18142dcc2cb5e532d7ed57042eece3d095cf1b3801cf0f5f2b6d7f05bf5a05b4e37d5f3
+EBUILD gedit-plugins-40.0.ebuild 2715 BLAKE2B a155f67ecead8da85a437a06b49a411bf41052ee5af4d2457b23cdd14459502b0caa8162d13e3f48929d51915824f989ca14bc426965d97a0f82013ffa1ee4de SHA512 91eabb78e3860d8d4ae91ce92428bbc692e5f4be3befb689b4300bbcf83cf430223edcff3a3166925e2b34fc059a86aa06b873e74a6dc0ae1af29e44220e120b
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
index 29aaf7fed10c..710d8c041c40 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild
index e86e21590fcf..615262ea716c 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
@@ -25,7 +25,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-3.36
+	>=app-editors/gedit-40.0
 
 	>=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.9:3
@@ -34,7 +34,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=app-editors/gedit-3.36[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+			app-editors/gedit[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}]
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 37ef978a7893..16640e3dde94 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,13 +1,10 @@
-AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
-AUX 3.36-make-gspell-optional.patch 2126 BLAKE2B b4e56744d3ece3e380c1aa628c02237ec8b36fa1c2b9efeee30391cbe9e3d5016e540862b25404ec4f807d9dfb3b78c2a6dc5f5ead2a71dbf4889d78af4cc2b1 SHA512 5916685a00ffa2f1b6f0b0ae77f5165a0199a40eb87e32d00a534d5049454df8aba9c1ba507fb5c1b8c4009c1c1689b962d2051a70173fd335007d5872eeaad0
-AUX 3.36-make-python-optional.patch 2509 BLAKE2B d88b0bf53e37cf20520b5d22565e3ecdfadb112751345784c962747602fd086cf238196ef33c340e228d0aa799631645d5b250bbaa650acfcb387000409405cf SHA512 bc87270a19d8f067ba5d7e697468526a931e020959b04bb1c824dcdf8ca5fe5799cfbf53b1b6e70862a7badbc7a0be98b34cbae1e3cabf90cbfccfd7d6c81b83
 AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
-DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
-DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
 DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
-EBUILD gedit-3.34.1.ebuild 2194 BLAKE2B a3eb2e4dc8094b9baf9670f84844bb086194abd73807ec7b9ae992cdb3ca7af7e50a0bf1b83e0eeeb7126b3d8997fd774d7e397c2ce8c61ddc1a8eccede06e89 SHA512 5aefc4ff696dc55405cf09dd016288a610b8b0a9c3c9d7f7ace294ee46d240c96d8a41dfdf20a776e459d67874c522b105d2bae336bea61b079812e7eb8880eb
-EBUILD gedit-3.36.2.ebuild 2413 BLAKE2B f6764f88362bb49f8a9d709859e1e42efd59cf2b9fbf6762b4847f5284aeffea1aadd3ef88aa14027f1574d43aac26f34012ab7e3a358e30816ac3a800eb25ca SHA512 8181de32899df3de423711b85501ed361d4f7c43ad4c4d62545d50535b52c9cf1283997f030b6378fc6f37e6b8e0106b79f59c63712b6378f2eab0d7aaf35bb8
-EBUILD gedit-3.38.1.ebuild 2271 BLAKE2B e736e05be9452b79440652dbc46c4f9de4d74081f4fc9dcf04c147addbb61d6e44b21f3e9ade405c971cb82763147505d86cba85dd505da5b332d6a1634e61f8 SHA512 166c55db5fad6636cac88e60e911b52e27d875a6c0079fbb2f20bc4e0fd3b9feeed9f653e0d3b7cea645e4fb17b5b89f31742c458d703584fa9563f1893f19d4
+DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e
+DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
+EBUILD gedit-3.38.1.ebuild 2270 BLAKE2B 69d117a04236aa8643c992c683412290991609ebf9131035fdbb2c2c84a8e4157d868e47243794cebe91513051638fe04b76c741de8acbfbfe9196c7ce379a8e SHA512 5fa553b145169481336968982b42cc3b51ca703aef3de7e833ff8f31d9255ed049d8975ba888a4b3ee21fd72114d3309a230436b89206fb32a270b06c0c18d18
+EBUILD gedit-40.0.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
+EBUILD gedit-40.1.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
deleted file mode 100644
index 1d772590f605..000000000000
--- a/app-editors/gedit/files/3.32.2-make-spell-optional.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhan@gentoo.org>
-Date: Sun, 26 May 2019 14:19:17 -0400
-Subject: [PATCH] make spell optional
-
----
- meson.build         | 4 +++-
- meson_options.txt   | 4 ++++
- plugins/meson.build | 4 +++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2f4d7e5..f67e320 100644
---- a/meson.build
-+++ b/meson.build
-@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req)
- libgd_dep = libgd_sp.get_variable('libgd_dep')
- 
- libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true)
--gspell_dep = dependency('gspell-1', version: gspell_req, required: true)
-+with_gspell = get_option('spell')
-+gspell_dep = dependency('gspell-1', version: gspell_req, required: false)
- x11_dep = dependency('x11', required: false)
- 
- introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false)
-@@ -189,6 +190,7 @@ summary = [
-   '  Introspection: @0@'.format(generate_gir),
-   '        Plugins: @0@'.format(build_plugins),
-   '       Vala API: @0@'.format(generate_vapi),
-+  '          Spell: @0@'.format(with_gspell),
-   '  Gvfs metadata: @0@'.format(enable_gvfs_metadata),
-   '',
-   'Directories:',
-diff --git a/meson_options.txt b/meson_options.txt
-index 90803fa..e1f7349 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,3 +16,7 @@ option('documentation',
- option('enable-gvfs-metadata',
-         type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
-         description: 'Enable using gvfs to store metadata')
-+
-+option('spell',
-+	type:'boolean', value: true,
-+	description: 'Build spell support')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index af94ab7..abeeac5 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -21,5 +21,7 @@ subdir('quickhighlight')
- subdir('quickopen')
- subdir('snippets')
- subdir('sort')
--subdir('spell')
-+if with_gspell
-+  subdir('spell')
-+endif
- subdir('time')
--- 
-2.21.0
-
diff --git a/app-editors/gedit/files/3.36-make-gspell-optional.patch b/app-editors/gedit/files/3.36-make-gspell-optional.patch
deleted file mode 100644
index e891f98f0c00..000000000000
--- a/app-editors/gedit/files/3.36-make-gspell-optional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d622460b08c7c13ce8e0c23e3afcbd1e4c65d019 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:20:31 +0300
-Subject: [PATCH] build: Make gspell optional
-
----
- meson.build               | 3 ++-
- meson_options.txt         | 4 ++++
- plugins/spell/meson.build | 4 ++++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index edb2896a6..b8707f33d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -63,7 +63,7 @@ libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_req)
- 
- libgd_dep = libgd_subproject.get_variable('libgd_dep')
- 
--gspell_dep = dependency('gspell-1', version: '>= 1.0', required: true)
-+gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
- x11_dep = dependency('x11', required: false)
- 
- introspection_dep = dependency('gobject-introspection-1.0', required: false)
-@@ -154,6 +154,7 @@ summary = [
-   '        User documentation:    @0@'.format(get_option('user_documentation')),
-   '        GObject Introspection: @0@'.format(generate_gir),
-   '        Vala API:              @0@'.format(generate_vapi),
-+  '        Spell checker plugin:  @0@'.format(gspell_dep.found().to_string()),
-   '',
- ]
- message('\n'.join(summary))
-diff --git a/meson_options.txt b/meson_options.txt
-index d0cbf0720..03e07244e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,10 @@ option('gtk_doc',
-        type: 'boolean', value: false,
-        description: 'Build API reference for plugins (requires gtk-doc)')
- 
-+option('spell',
-+       type: 'feature', value: 'enabled',
-+       description: 'Build spell checking plugin')
-+
- # This option exists for the developers, to speed up the install.
- option('user_documentation',
-        type: 'boolean', value: true,
-diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
-index 8ce7634b7..cccb42fc1 100644
---- a/plugins/spell/meson.build
-+++ b/plugins/spell/meson.build
-@@ -1,3 +1,7 @@
-+if not gspell_dep.found()
-+  subdir_done()
-+endif
-+
- libspell_sources = files(
-   'gedit-spell-app-activatable.c',
-   'gedit-spell-plugin.c',
--- 
-2.20.1
-
diff --git a/app-editors/gedit/files/3.36-make-python-optional.patch b/app-editors/gedit/files/3.36-make-python-optional.patch
deleted file mode 100644
index c27a0551f00b..000000000000
--- a/app-editors/gedit/files/3.36-make-python-optional.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d082ef03b9f545980ab77e6c0a20d5bf4893be69 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:34:42 +0300
-Subject: [PATCH] build: Make python optional
-
----
- gedit/meson.build   |  2 ++
- meson.build         |  4 +++-
- meson_options.txt   |  4 ++++
- plugins/meson.build | 11 +++++++----
- 4 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/gedit/meson.build b/gedit/meson.build
-index 075c001b2..174deba04 100644
---- a/gedit/meson.build
-+++ b/gedit/meson.build
-@@ -214,6 +214,7 @@ if generate_gir == true
-     install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
-   )
- 
-+if get_option('python')
-   python3.install_sources(
-     'Gedit.py',
-     subdir: join_paths(
-@@ -221,6 +222,7 @@ if generate_gir == true
-       'overrides',
-     )
-   )
-+endif
- 
-   libgedit_dep_sources += [
-     libgedit_gir,
-diff --git a/meson.build b/meson.build
-index b8707f33d..4e40833ec 100644
---- a/meson.build
-+++ b/meson.build
-@@ -69,7 +69,9 @@ x11_dep = dependency('x11', required: false)
- introspection_dep = dependency('gobject-introspection-1.0', required: false)
- vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
- 
--python3 = python.find_installation('python3')
-+if get_option('python')
-+  python3 = python.find_installation('python3')
-+endif
- 
- build_checkupdate_plugin = host_machine.system() == 'windows'
- if build_checkupdate_plugin
-diff --git a/meson_options.txt b/meson_options.txt
-index 03e07244e..cdcec6165 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,10 @@ option('gtk_doc',
-        type: 'boolean', value: false,
-        description: 'Build API reference for plugins (requires gtk-doc)')
- 
-+option('python',
-+       type: 'boolean', value: true,
-+       description: 'Install GIR python overrides and python plugins')
-+
- option('spell',
-        type: 'feature', value: 'enabled',
-        description: 'Build spell checking plugin')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index a9167f8d6..97f1b1765 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -20,13 +20,16 @@ if build_checkupdate_plugin
- endif
- 
- subdir('docinfo')
--subdir('externaltools')
- subdir('filebrowser')
- subdir('modelines')
--subdir('pythonconsole')
- subdir('quickhighlight')
--subdir('quickopen')
--subdir('snippets')
- subdir('sort')
- subdir('spell')
- subdir('time')
-+
-+if get_option('python')
-+  subdir('externaltools')
-+  subdir('pythonconsole')
-+  subdir('quickopen')
-+  subdir('snippets')
-+endif
--- 
-2.20.1
-
diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild
index b3c466392a1e..570c7cf25780 100644
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ b/app-editors/gedit/gedit-3.38.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-40.0.ebuild
index b767ef9772d0..8a7d0429c49e 100644
--- a/app-editors/gedit/gedit-3.36.2.ebuild
+++ b/app-editors/gedit/gedit-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,21 +14,20 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.52:2
+	>=dev-libs/glib-2.64:2
 	>=dev-libs/libpeas-1.14.1[gtk]
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
-	>=gui-libs/tepl-4.4:4
-	x11-libs/libX11
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+	gui-libs/tepl:6
 
 	spell? ( >=app-text/gspell-0.2.5:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -44,7 +43,7 @@ RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
@@ -57,8 +56,8 @@ PATCHES=(
 	# disagree with; those wanting them off in general would set that globally for gtk
 	"${FILESDIR}"/restore-overlay-scrollbars.patch
 	# Make gspell and python optional
-	"${FILESDIR}"/3.36-make-gspell-optional.patch
-	"${FILESDIR}"/3.36-make-python-optional.patch
+	"${FILESDIR}"/3.38-make-gspell-optional.patch
+	"${FILESDIR}"/3.38-make-python-optional.patch
 )
 
 pkg_setup() {
@@ -66,14 +65,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use vala && vala_src_prepare
+	vala_src_prepare
 	xdg_src_prepare
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
 		$(meson_use python)
 		$(meson_use gtk-doc gtk_doc)
 		-Duser_documentation=true
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index 0d2d1f533f3c..8a7d0429c49e 100644
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,27 +14,25 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
+	>=dev-libs/glib-2.64:2
 	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/libxml2-2.5.0:2
-	>=net-libs/libsoup-2.60:2.4
-	x11-libs/libX11
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+	gui-libs/tepl:6
 
 	spell? ( >=app-text/gspell-0.2.5:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
 			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
 		')
 	)
@@ -45,7 +43,7 @@ RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
@@ -54,7 +52,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/3.32.2-make-spell-optional.patch
+	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
+	# disagree with; those wanting them off in general would set that globally for gtk
+	"${FILESDIR}"/restore-overlay-scrollbars.patch
+	# Make gspell and python optional
+	"${FILESDIR}"/3.38-make-gspell-optional.patch
+	"${FILESDIR}"/3.38-make-python-optional.patch
 )
 
 pkg_setup() {
@@ -62,18 +65,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use vala && vala_src_prepare
+	vala_src_prepare
 	xdg_src_prepare
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use python plugins)
-		$(meson_use gtk-doc documentation)
-		-Denable-gvfs-metadata=yes
-		$(meson_use spell)
+		$(meson_use python)
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_documentation=true
+		$(meson_feature spell)
 	)
 	meson_src_configure
 }
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index 9bea5210e0bf..7f9ab4db0afb 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390
 DIST gnome-latex-3.38.0.tar.xz 1094376 BLAKE2B 0c02996dbac48c3859d33a0d504a64462e306d346ca22397820231fa8fe7ce2aa621a1435a02d78ea424fc8e9f5b7ac6e3e60180d8212c170d52eb4baee3b94a SHA512 c42cc1ff2c59afe4d995e9f13d9a858e2297827d5f9359cecd969d305224fc4b4d0306e0ab6aa1d9b7fc92acc25e597319299afe176cff1903f734fbc2ddf29b
-EBUILD gnome-latex-3.36.0.ebuild 1134 BLAKE2B e30477f51580d52b2c120334914b10ede09cae50eba5f19a4d9c2511a0f9096cc59df8edbbee252330ce640c046e066e78c34e054ea5c40c3a4b6fe582444917 SHA512 3f9d26de278eb082cb2d0452a9889d39c506996a30bcb63ee157160e6a7ebb32cb7b03ccbdccae4398b9eae78a3366cb05b2115bb0e95c33527b74e95c823ae6
-EBUILD gnome-latex-3.38.0.ebuild 1128 BLAKE2B 0d5cab9987a7ee827603ec3a830c3da220251af5e273756f58c182c771c83f8104e03d5d1d61eb2f456a8e01642e4e6723cd47f8f3d81adb3c047dbe56f21b92 SHA512 f96272dafd5c8166cfb18927abecbbd1ccf51eae36b99a33fe7f8cc0639741c58d960629ddc2253b9919ea4c4a0f02d19522abb876afb3fd9a840298a299301b
+EBUILD gnome-latex-3.38.0.ebuild 1126 BLAKE2B 607a93730516d9af1059fcfdd6e4ff990e8b5080996a7f24c98cd94b622449ac2588bd718d88bff8c16b6c1822f52bc86eae5cef719cbd41d9a93261735b400a SHA512 e3576e9cb410cdb657aa8891a0e3a638cc6abfcaa51d89d9f0d87578d1d2d8e7a41e88c661b1edcdc11bfd037fc90000670cf1c1f42b02e0c32568a2c56f38e3
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
deleted file mode 100644
index c61b7c6451a2..000000000000
--- a/app-editors/gnome-latex/gnome-latex-3.36.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.4: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/gnome-latex/gnome-latex-3.38.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
index a473957b2ef3..ff16b60f733d 100644
--- a/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection +latexmk rubber"
 
 DEPEND="
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index f5c7fbd72d79..57500bdba1a9 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -5,6 +5,6 @@ AUX hexcurse-1.60.0-gcc10.patch 1095 BLAKE2B 399cbef6c1136626f83851a23e82dd180cc
 AUX hexcurse-1.60.0-tinfo.patch 386 BLAKE2B e4f376cc9cf60c9163553aa9082e5c84a228f0704c575941414cde6527cb6c9b867d55cba45dbb35bdd95d79ee8d13acee3a139256d794f9f648af87581ed458 SHA512 ce0c25842a874d631d75826f6b967fe0d0f53a435e6222eed1310caa884b570c1cf131c14e0be84fc7de728e37cdaee5b950ada527fd03ddba0dacf578e4fe42
 DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174ca3cc7d29232c6d2a2f909339a0555ff459ed373e62e35b3d1d8abfbbd32a9462006b20bfa1f4f641f4eba825 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7
 DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
-EBUILD hexcurse-1.55.ebuild 668 BLAKE2B 363ee5ddff71041a59c495905caeb38009e015c4e9ccdf04d8b719908ba7975b8f14cb7ba5eacaf2cc18a089133a75223ac00bd7c43117f359028d2dcbc25737 SHA512 70b609e4214d81a5df16f4eb9dba612fe1e1c35b86e5af30e229c75bc0d7f10393adc00953f8c031e19bb4fee7f773ca84b56ed60b0994ecabe6a25bbb1c975f
-EBUILD hexcurse-1.60.0.ebuild 649 BLAKE2B 436c2643c730d2b570e73e1a68f44fe0329710f89c435b8c67361ec2968fd599fe2d3d544acdc1fd52e9005623a074d64610751cff04c35cc950958b1d3db29f SHA512 b76b405d7ca8a0d360e697657f75fce31eb1b79a203681c8a109546f2d91a6eebb30e11eaf4c8df99ebb5b98e0fbefa0984ae7439c5fea4c295895d2175d5a5f
+EBUILD hexcurse-1.55.ebuild 669 BLAKE2B e7a9a7328c039cbe0c020e1eb68ea4adf9e8c97687dc090fa3594986e7e297f7725266397f59b52d1450c0e06ecc34ae0813dbe471938c8a427673abf1d47d3e SHA512 0e7ffc5d7cfc82c2c7b4d185cd30b12886a143557d04b8dc0a50a6c1eac1f8de05f9fb2962c4e5f763d51743b0e2109ad199e20d09007106bc870ebbca4547ef
+EBUILD hexcurse-1.60.0.ebuild 650 BLAKE2B 22a5021296d9aa0f50384abbfee8e06603154c62a65c31556e5bd43088fc7fa32323c8fcd89e82b9091bcdc04ac8f7146eef2e401c315e2e1e7ba9dfa75ec75d SHA512 490a1048f6b8d97508cccc8ffaa29a32a88e0360a6441e67f141173f73cb8ccbca8b4851c326f987626b48666332532522f92c760e92b7d94d918cd635cc1214
 MISC metadata.xml 341 BLAKE2B f4e87e5d95358a8f4078d0e6940f7d6b3f7f68f6ba7b5ecd4b2d28b3a55528e0ab70787c5768b9b6fe27e293a3225c87a147d163eab3d3798d4f6e14d2c54f67 SHA512 9dae98987744bc9a84ac94d729dbd6e1147abc81bde05cfc784ce039b34c75f6c22d1da88b25cee28594ffb5286a65cf38331c30b45af2bba5dec61580260ec6
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
index 9e8e769027bf..5b80c54dbe92 100644
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="ncurses based hex editor"
 HOMEPAGE="http://www.jewfish.net/description.php?title=HexCurse"
@@ -10,7 +10,7 @@ SRC_URI="http://www.jewfish.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0="
 DEPEND="
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
index 809227e4d264..02ea4289b7ab 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LonnyGomes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index d0ef6111a826..4afb5a700be7 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 682 BLAKE2B 3b9fda7e50453e587771de817f16ffc21067c1e26a7e652f2a3489dfb91e5fbe32e84cb577f32d94bb6672ec0272df4997ee9e7094a0711f2378ae3382e27928 SHA512 3ac27996bb10539af4ced5ff23e4988641da55920ed9719c2473c714db78c84e59a69fc90f7dd92be65e2f3b5d375f73baa8b3acc2b7934f4b44f0ada9d40479
+EBUILD hexedit-1.2.13.ebuild 695 BLAKE2B 660887f7e70f77d396d3d9e6eee029e323b65c654d05a2cfbd1ecd30e9baee24362379c4fd91fd833b83d50d8f72820c0e375fe7a3f31cdbb9ad3324f4e88a69 SHA512 0ee3bc0505067752f2d0c8b83cb476bd81b9c441f42ce298fb96c7183ad19810b93ce3eb886fc6a23ece7842f79bcc9acbe8483ebaa61f0d32c6cae76bfa4363
 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 299f969f1681..d0b42fcc75f5 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="View and edit files in hex or ASCII"
 HOMEPAGE="http://rigaux.org/hexedit.html"
@@ -10,15 +11,20 @@ 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}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.13-tinfo.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.13-tinfo.patch
+	default
+
 	mv configure.in configure.ac || die
 	eautoreconf
 }
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 4a296fa2e932..71421f196ce8 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -2,6 +2,6 @@ AUX jedit-5.2.0-build-xml.patch 530 BLAKE2B c42c1a9f5350e66dc6e4160cb2b02d1e16ee
 AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
 DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
-EBUILD jedit-5.2.0-r1.ebuild 2315 BLAKE2B eda5bd828426fea14fa4f67a434a14b4e96ee9b6c208c89a4c9606cc18cb56df12cf30311c9dd3fd6e6a3111d6cda6f0cdeb5c435c8210bff8f63df96e435ae5 SHA512 65d9375296fa8e2cca097b7222901463901327c8e0c34fcaae86271e718db054a9e32662e0290e173353fc4a79978dd81d67ee568d30db222b0679870c8d73c5
-EBUILD jedit-5.4.0.ebuild 2429 BLAKE2B 54e93d0e67df261713e653da1b73a59213e74d83e5713951c6a1385f23efd0e8f32d37d475f5e8725a8c8551d11ea4d799e59103291fd24a7c69e0eacd233830 SHA512 5504784879b780ce9e9a8fadc44846736c08df3f383d32de5949d9414a9b9074ecdf6932dbf2b7643c9626b196af2e3f1de68af547cb4bfe5442c9573009d1f1
+EBUILD jedit-5.2.0-r1.ebuild 2315 BLAKE2B 27b81852ec7288dc5d44c2fd4f2853659a739f8ae39aced1ed7b6360a647e00ea2ebfb16c417ee70bd9d53c6a1f3aa1ca93f5a74e6b968b8f91e26a273f547b5 SHA512 b9161a57831484b52085e0b7fd98d7dae0030470844e0df8fbc16370f817b7bb4fd223e14530840a1be9bd9c9b24a7d70f4f9c10b509504e182b559bd87cf867
+EBUILD jedit-5.4.0.ebuild 2427 BLAKE2B 2632a1bf8b0de4d34ca31c3fefba5bad02807d248535ae9aeba1957493be5e9c094a67aacee90b15f0cae705346803e5a7c41c7dfe7524c4af14b909d909eacb SHA512 a8433761c69040d904d2643b8b946a3c8aacb87b5e796fbba616e24742a4b8b4c198ff7057eae6327717ec4ce71575c9675b803ac8a71d3b998e97d1bc5024e3
 MISC metadata.xml 311 BLAKE2B 7363e29fccf6d99776fe1e6ae7cdff121272dde68207519df05b765e52ffeb4d0c4a3184847aa1ca10291c30ac1438da5e393c6b23cc9a2bed46b7be06afff41 SHA512 86e21988f7f67ca938bfad13389991533b89202be6b7e721bd3cac1a8e4a2316e62444a81de56848d016273795f4c166216f9a7b599ebb3aa43c7657a7d4f182
diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild
index 3d842a2ef6be..e6ff8beafda0 100644
--- a/app-editors/jedit/jedit-5.2.0-r1.ebuild
+++ b/app-editors/jedit/jedit-5.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc test"
 
-inherit eutils java-pkg-2 java-ant-2 xdg-utils
+inherit epatch java-pkg-2 java-ant-2 xdg-utils
 
 DESCRIPTION="Programmer's editor written in Java"
 HOMEPAGE="http://www.jedit.org"
diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild
index 42744cd248a8..c4a52eee362a 100644
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc test"
-
-inherit eutils java-pkg-2 java-ant-2 xdg-utils
+inherit desktop java-pkg-2 java-ant-2 xdg-utils
 
 DESCRIPTION="Programmer's editor written in Java"
 HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 SLOT="0"
 
 CP_DEPEND="dev-java/jsr305:0"
diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
index 597a44d375db..d2fbc76bcc95 100644
--- a/app-editors/levee/Manifest
+++ b/app-editors/levee/Manifest
@@ -1,6 +1,6 @@
-AUX levee-3.4o-darwin.patch 318 BLAKE2B 910cf037791f260d7c8471f0b8abb9fabdd9c281acf4c27fd8e4985b0700d5e93c7daf783cf6cda0583d16ffa8b681d7bf7c48035129b9782e23ccf331fbec6e SHA512 8f29e675e03ef67922f396950cc7245bd6dda15aa2bdea21fc2b75b3f93d641cc46cd5cdfa878dc5780ff01e66e9d8708a6e67625248bd21fe2679b458f60faf
-AUX levee-3.5-glibc210.patch 2448 BLAKE2B 181bfb232b5ee9356c1a7ee23b54d65f3c73a77589335323c535db96b7160a6bcc00c44f4b5b6cd077c15615e5e02ad0e9f09b06011ebc57ab9301c1f5660b8e SHA512 178e77e6fb88517c0001d95e99164a67d3d6342dc0ff3dd2d355f2b2823d2fbdf2a851909d2c935dc629391a4ccc861c55a6c5ed9ce8d74dd1987c924c9f9307
-AUX levee-3.5a-QA.patch 637 BLAKE2B b98f04d4abd20b8b937d360e809e88c0b86b7b010ed24327cf8243b47f9ec11232865ad41999f5a1ad42ba09a891153452522bc69bebf305ef54218810febbfc SHA512 30878ad11f021fed3912dd06b397c80539c98b0795a39a98134a6466a8d3041162bf9e3d43ede9780e5f415ba481a21b925d16f33297118fb246158607f19227
+AUX levee-3.4o-darwin.patch 265 BLAKE2B c099dca875658567a788cc1bfe3928c7969266b50ec5e8ffb1194e7b88db1f691e0d4b97243198e48402f442914f19c0ef1f269e8df221153950622fa4a43328 SHA512 6b05d59021408fadf044ea388729632e9770780b2206725401aaa19f8151171f9b18f4dfdf60cbc7a74ee344855ce23978cef79978416728342999dd8fc96244
+AUX levee-3.5-glibc210.patch 1683 BLAKE2B dafaf7b7bb8a8d11ef8c74f81800449d54b582ea1ab202539c7e630dd8aca7aa4d5b302a21292a3cfe978163b9c8d5089ec7e5931e43b75448a86faeb77db265 SHA512 8aabe959dc12e551128045cda1027498a4fd0b42eb7fc47888cfaab2f1a2fe15c3e600d1952dc78e43bc58252ff8f4e1552fbb5e7f83aae9ce77681b7e62649a
+AUX levee-3.5a-QA.patch 468 BLAKE2B ba4643a624b64c0a602c3717a1982af7436aa04cd17a05f5b353049fbbda30f08931d329a476ea17572c0c4e6338cb4e798e1105c8ba3f1c7d1cd8f4003c8c47 SHA512 23060c7b452b53ae6b354d4a727bc4e0430ea933ab7124be357432d46bf186a473b72f141406e834a492790057279126db6a60a51f2fd0a5522a7d2e586b4638
 DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de66e987f8a7b506965a21ff149c6fe445532e9b065e40dd7e519d1ebc6b5ff69c5b4a4129138df224f71dfd SHA512 e95b4fc6370903dda07aff0a612c7f34425ab0b854d05a08f42b7e339d1a86a436316d31f3667748943e2ce2e68be7f2369e4a3b36c0715b00d31b8ab50cdaf1
-EBUILD levee-3.5a.ebuild 1010 BLAKE2B d30c62eb676bb0147ea5c7c1cb2885eece7406ac42ae355ef723d976f34e87a4bf0438a06149424b86295bf5182f4b43799640242cbccf60e5c5d46c8b12b7d9 SHA512 c35a57895a8341e1f4889bb72ac59dc1682132b5ee5eb173f50dd16a3ce9103c12f4993ae2f5c3149e95943acd6ba86ae335b6af9e6cf6cee51f921188dcccb7
+EBUILD levee-3.5a.ebuild 1014 BLAKE2B 6666b02a65fea1f47909faf22d13416375d689222d024e361845dd91924031cc8725fd138c9b36c8257b21007071b671d6dce7aa20cef24d42454da4eb0c2638 SHA512 1de1ca958e5886f005df829d33fd547efea2ae28ce915d523032b8ec117dfc7118a5427f172db7770978bbe21f0432123ebcc24ebabafd9067b95e1a1497c8b0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/levee/files/levee-3.4o-darwin.patch b/app-editors/levee/files/levee-3.4o-darwin.patch
index 9481b1a3ade9..0af6f7994966 100644
--- a/app-editors/levee/files/levee-3.4o-darwin.patch
+++ b/app-editors/levee/files/levee-3.4o-darwin.patch
@@ -1,5 +1,5 @@
---- unixcall.c.orig	2007-03-18 17:46:05 +0100
-+++ unixcall.c	2007-03-18 17:51:13 +0100
+--- a/unixcall.c
++++ b/unixcall.c
 @@ -77,6 +77,13 @@
  static int ioset = 0;
  static struct termios old;
diff --git a/app-editors/levee/files/levee-3.5-glibc210.patch b/app-editors/levee/files/levee-3.5-glibc210.patch
index 51cc829cda25..f290613d2633 100644
--- a/app-editors/levee/files/levee-3.5-glibc210.patch
+++ b/app-editors/levee/files/levee-3.5-glibc210.patch
@@ -1,6 +1,5 @@
-diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
---- levee-3.5.original/editcor.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/editcor.c	2009-07-21 23:07:21.000000000 +0000
+--- a/editcor.c
++++ b/editcor.c
 @@ -183,11 +183,11 @@
  
      strcpy(scratch, "/tmp/lv.XXXXXX");
@@ -14,9 +13,8 @@ diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
      if ( (tf = mkstemp(scratch)) < 0 ) {
  	prints("[tempfile error]");
  	return FALSE;
-diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
---- levee-3.5.original/extern.h	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/extern.h	2009-07-21 23:02:39.000000000 +0000
+--- a/extern.h
++++ b/extern.h
 @@ -195,11 +195,11 @@
  extern exec_type PROC editcore();
  
@@ -30,9 +28,8 @@ diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
  extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo();
  extern bool PROC ok_to_scroll(), move_to_undo();
  
-diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
---- levee-3.5.original/main.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/main.c	2009-07-21 23:09:52.000000000 +0000
+--- a/main.c
++++ b/main.c
 @@ -251,11 +251,11 @@
  	println();
  
@@ -46,9 +43,8 @@ diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
  	if (mode == E_VISUAL && zotscreen && noquit) {	/*ask for more*/
  	    prints(" [more]");
  	    if ((ch=peekc()) == 13 || ch == ' ' || ch == ':')
-diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
---- levee-3.5.original/misc.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/misc.c	2009-07-21 23:09:10.000000000 +0000
+--- a/misc.c
++++ b/misc.c
 @@ -19,11 +19,11 @@
   */
  #include "levee.h"
@@ -62,9 +58,8 @@ diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
      int len;
      char flag;
      
-diff -NrU5 levee-3.5.original/move.c levee-3.5/move.c
---- levee-3.5.original/move.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/move.c	2009-07-21 23:10:26.000000000 +0000
+--- a/move.c
++++ b/move.c
 @@ -158,11 +158,11 @@
      case FSEARCH:
      case BSEARCH:
diff --git a/app-editors/levee/files/levee-3.5a-QA.patch b/app-editors/levee/files/levee-3.5a-QA.patch
index 7e37c76b34ac..f6553813d8ca 100644
--- a/app-editors/levee/files/levee-3.5a-QA.patch
+++ b/app-editors/levee/files/levee-3.5a-QA.patch
@@ -1,6 +1,5 @@
-diff -NrU5 levee-3.5a.original/configure.inc levee-3.5a/configure.inc
---- levee-3.5a.original/configure.inc	2009-08-12 19:51:26.000000000 +0000
-+++ levee-3.5a/configure.inc	2009-08-12 20:13:41.000000000 +0000
+--- a/configure.inc
++++ b/configure.inc
 @@ -1074,11 +1074,11 @@
      else
  	PROG_INSTALL="$DEST"
diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild
index 965d248fd053..e5a02aa046fb 100644
--- a/app-editors/levee/levee-3.5a.ebuild
+++ b/app-editors/levee/levee-3.5a.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs eutils
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Really tiny vi clone, for things like rescue disks"
 HOMEPAGE="http://www.pell.chi.il.us/~orc/Code/"
@@ -11,29 +12,35 @@ SRC_URI="http://www.pell.chi.il.us/~orc/Code/levee/${P}.tar.gz"
 LICENSE="levee"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-DEPEND="!app-text/lv
-	sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
+RDEPEND="
+	!app-text/lv
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4o-darwin.patch
-	epatch "${FILESDIR}"/${P}-QA.patch
-	epatch "${FILESDIR}"/${PN}-3.5-glibc210.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4o-darwin.patch
+	"${FILESDIR}"/${P}-QA.patch
+	"${FILESDIR}"/${PN}-3.5-glibc210.patch
+)
 
 src_configure() {
 	export AC_CPP_PROG=$(tc-getCPP)
-	export AC_PATH=${PATH}
+	export AC_PATH="${PATH}"
 	export AC_LIBDIR="$($(tc-getPKG_CONFIG) --libs ncurses)"
-	./configure.sh --prefix="${PREFIX}"/usr || die "configure failed"
+
+	./configure.sh \
+		--prefix="${PREFIX}"/usr || die "configure failed"
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" CC=$(tc-getCC)
+	emake \
+		CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" \
+		CC=$(tc-getCC)
 }
 
 src_install() {
-	emake PREFIX="${D}${EPREFIX}" install
+	emake PREFIX="${D}/${EPREFIX}" install
 }
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index 872568a776eb..67e96314fdd8 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -1,5 +1,7 @@
 AUX lpe-1.2.6.13-fno-common.patch 603 BLAKE2B 1c78bf5d7e049d101c890dda5d22833de0489a381ec071760745c53bf8ef72a552010fa1340ba02b262fe67af38d4f858ae472d34e3ff8a55b6325dbfb55beb4 SHA512 6a2ddbc03ca09cbd499f6b471c2eb76db4a78294467e9e73365fd99a3f4a5af3d6d539cf2fbc77261cb57a9aa6751199e6ef19a252e6caf12502a9ad9f136876
 AUX lpe-1.2.6.13-make-382.patch 797 BLAKE2B 548091708e01e3baf9d52eaa7f8638d870f10060b858162ea19d8bb70062ca7883fa16c431c839e939dcfc1917c8b7c675180aaff47424dde326f74866885649 SHA512 442b5dbfb11b002f86d2a67cef1c4f57a5ac6e3965cc0618f0bd7058d14ea79ed4f108c40f25cf94ff6edefa8655d5a46c2bcc2552c60c66322e194117e5ca11
+DIST lpe-1.2.8_p20210401.tar.gz 840016 BLAKE2B 81fa0b1c3f9a7164eb219692a2e7bc092d0ee09c9de15f6fd2a4f66cc486be5b744eaa2fb0569a9f44f45d6a19159c55286be76d9ae0f4947f5b7c749e84a8fb SHA512 0b40f2f3fc1241e07291dfdbfcf2466cf5dedc1c91bf36c4f36c8af792ce718be2ad66884b049e25d7b9f9e796d60ce25ca42b37610d26894cd1dc6b74e51157
 DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
 EBUILD lpe-1.2.6.13.ebuild 1269 BLAKE2B 4f7a1a3d6518c184ba76f39b4dc427430eb8450feb3a91e736f81448afdfab2e59b6dd3c8f0bff2c7f08b1d4c76c42046e6fba0a5e72865d9314afc8c53c3ea7 SHA512 261ffa5abdecf4d522cfb25eb83333af1770a6d919ec9d99717dbf440bf600500c5b9653ccb18a373f29f3cb4c737f20e464fb6b3be17536c56209a1de910ba7
+EBUILD lpe-1.2.8_p20210401.ebuild 1601 BLAKE2B d7276453e57c8206d8d2008356cdb08b770fef42306d71762def3c4641472c1c7945249f95e50a2236296337717e13206b252dc467378ea0920d26304579c574 SHA512 b77f01ebc38f7747de74660a66f87727afab9b78bc4d92d419796383f3aae85465edbdcc9eda2b3e98478fb2d7c0b2f7e4c3ed5e4b0550a4a58e2183a9489086
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
new file mode 100644
index 000000000000..70babea77f0a
--- /dev/null
+++ b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+COMMIT="203c88eae66c6a3bffd050286af6d9aacf85816e"
+DESCRIPTION="A lightweight programmers editor"
+HOMEPAGE="https://packages.qa.debian.org/l/lpe.html"
+SRC_URI="https://github.com/AdamMajer/lpe/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/slang
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+"
+
+src_prepare() {
+	default
+
+	# You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and
+	# replace -lncurses in src/Makefile.am with $(NCURSES_LIBS)
+	# That is, if you need eautoreconf
+	sed -i \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs-only-l ncurses):" \
+		configure.ac || die
+
+	# Actually use what configure discovers (above)
+	# bug #779778
+	sed -i \
+		-e 's:-lncurses:@NCURSES_LIB@:' \
+		src/Makefile.am || die
+
+	# Refresh outdated libtool (elibtoolize insufficient)
+	# Fixes undefined references on macOS/Darwin
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-gettext \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake \
+		libdir="${ED}/usr/$(get_libdir)" \
+		prefix="${ED}/usr" \
+		datadir="${ED}/usr/share" \
+		mandir="${ED}/usr/share/man" \
+		infodir="${ED}/usr/share/info" \
+		docdir="${ED}/usr/share/doc/${PF}" \
+		exdir="${ED}/usr/share/doc/${PF}/examples" \
+		install
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 4ed246f6b93d..5d3a84b38bd5 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,6 +1,6 @@
 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
 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
+DIST mousepad-0.5.4.tar.bz2 855416 BLAKE2B a998b2faabae1ad505da3a8fb560c731e6f5002801cdc3a4edcd515d5d75210ae509261644070e1951629271bd5956aee1e196c35c6b7e9c3ab782cd06b35ac6 SHA512 52d1d9b235b13a651ee7e6e1633074c7829c27e880033637eacdd7cd63f246d1f47d0cd2c981cf2a7eb96dbb7119204a685f00a60968e4478d5057bce8500370
+EBUILD mousepad-0.5.3-r1.ebuild 863 BLAKE2B 01428fc40098ea9e23b35152c594c295e463854bf2c382957a6b67097b7a53205b5826413d84540ba4ec42de635bd09f2b367985b83bdd71c4bd5141a454cfe0 SHA512 ef0c3b0587389e009b59d0de6abe438de696002a361343f358545f06a6a0605531f7a3b96dd9ff853f2ec51ea3dea6ccda4af6966cf2d5bc42b437568df75781
+EBUILD mousepad-0.5.4.ebuild 892 BLAKE2B 113ae6fc8701c4920a3da8fc148c31d62e29b3364359bde515e8ef3cd1571232b28f6f27870624f8d16905e06f350f2984a6097af568b2e7412a2636a814c1cd SHA512 199b474bf3f87047d3f241c78c274376ff9abcd28278def2f8266a815cbcbb43501d75ba263dba2029906d6b476f4757e9af9a2ced9c158296c6a93c09ced6d3
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/app-editors/mousepad/mousepad-0.5.3-r1.ebuild b/app-editors/mousepad/mousepad-0.5.3-r1.ebuild
index 3440cd70cd85..ed7d2cd8fcf0 100644
--- a/app-editors/mousepad/mousepad-0.5.3-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.3-r1.ebuild
@@ -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:=
diff --git a/app-editors/mousepad/mousepad-0.5.2-r1.ebuild b/app-editors/mousepad/mousepad-0.5.4.ebuild
index ed7d2cd8fcf0..bcb567c7aa26 100644
--- a/app-editors/mousepad/mousepad-0.5.2-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.4.ebuild
@@ -10,12 +10,12 @@ 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:=
 	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/gtksourceview-3.24:3.0"
+	>=x11-libs/gtksourceview-4.0.0:4"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/perl
@@ -23,9 +23,12 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/mousepad-0.5.2-select-all.patch
-)
+src_configure() {
+	local myconf=(
+		--enable-gtksourceview4
+	)
+	econf "${myconf[@]}"
+}
 
 pkg_postinst() {
 	gnome2_schemas_update
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 8e935c3599c0..58c838eb1df9 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,9 +2,9 @@ DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe8
 DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
 DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
 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.5.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
-EBUILD nano-5.6.1.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
+EBUILD nano-5.3-r1.ebuild 2430 BLAKE2B 33487afb23e1b01280d6f6fe3f4ffc1008ca820a3e100919fa3c89cc874d80287befc979d3d3848b00cdcdad3954a43eb6fa2d8625320a6e1c9d83b49ad01312 SHA512 98ac275e4a54bee9500d5bd5d71a84e37ac1ce941a4ae5e827d1ae19209fa9d4bd3840e640d6017776f6fcd32df5ae08425f1ba5d2bce0b8e8a5e3ea2fd958d7
+EBUILD nano-5.5.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
+EBUILD nano-5.6.1.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
+EBUILD nano-5.6.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
+EBUILD nano-9999.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index 6f1437da2a77..18228c493c85 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/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"
+	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"
diff --git a/app-editors/nano/nano-5.5.ebuild b/app-editors/nano/nano-5.5.ebuild
index 64c74e70f9b1..aaa4c8829842 100644
--- a/app-editors/nano/nano-5.5.ebuild
+++ b/app-editors/nano/nano-5.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
 	inherit git-r3 autotools
 else
 	MY_P="${PN}-${PV/_}"
diff --git a/app-editors/nano/nano-5.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
index 64c74e70f9b1..aaa4c8829842 100644
--- a/app-editors/nano/nano-5.6.1.ebuild
+++ b/app-editors/nano/nano-5.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
 	inherit git-r3 autotools
 else
 	MY_P="${PN}-${PV/_}"
diff --git a/app-editors/nano/nano-5.6.ebuild b/app-editors/nano/nano-5.6.ebuild
index 64c74e70f9b1..aaa4c8829842 100644
--- a/app-editors/nano/nano-5.6.ebuild
+++ b/app-editors/nano/nano-5.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
 	inherit git-r3 autotools
 else
 	MY_P="${PN}-${PV/_}"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 64c74e70f9b1..aaa4c8829842 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
 	inherit git-r3 autotools
 else
 	MY_P="${PN}-${PV/_}"
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index a48b6aedb99b..c9358a2e3bf2 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,14 +1,7 @@
-AUX nedit-5.6-40_Pointer_to_Integer.patch 10379 BLAKE2B d7a855d17ca5744ec3d1a8f6b286911458236b452a98d36fe57e0779e17101786e7c52702dbc20f98b460f3b3ac05093823214adc99eb17399919d2361a60085 SHA512 263fd5109c5fc16ea8328ad7855b8ab74e6e744d89374d68bc7db495a3295888f3599d2e9d6653097b4f7b68bae968a5deb7240a565f8fa1beba451b8b1f1b55
-AUX nedit-5.6-fix-crash-with-noX.patch 4726 BLAKE2B 1378cd446adf148d5a69b772e790c6bbb052ce27c668c4b391f3f08081bc523368a6c4a63eae39c503b4f569c7f374c0b9c5303bf23505acb2f322dcc98f1121 SHA512 38a3292370482b295afa3eb7033061e2837819c519fa1d3215c4d69bdf11871ee193615ecec8a01a102da5e27e3098337db06ab296f3feffac53ed84d660bb90
-AUX nedit-5.6-format.patch 453 BLAKE2B b8a226e93e2c1666caefb5032706d8ac08284af3e2a2658f794b4af6eaae18311db52ed01a49c368d050958e55ef2fbc0893ee3b8bc63418bce676c5c4d7aae1 SHA512 50e93d7f297ae0b10bec34176c707cc61d4c205e1293cb02b94f85359604864df8698bf35725f007b9c9eb585d0cf18c2498b6d7f55960fabb93b3d98bfe02b8
-AUX nedit-5.6-ldflags.patch 800 BLAKE2B ee06dcdd07f7d01c23c943e85382d33d316e85c364b1c3bc243ee3468078e8a47a770191389dd53a94d83b6e896e9dbe15b40d365aab4f3a8ef5c8705941ea9a SHA512 65818ef8b425414bf4c9f0bd9b71b56df5a6ef05f0e2914558733cbc7bbe435199e8c69c66b2f460964d1913bbc6fb8722a77d881ea4efa1be07f8fb55ad66e4
 AUX nedit-5.6-security.patch 1944 BLAKE2B 8b3e21d074f274c5ba24f1888d9d13d71ac08f80c0e063a5e0e85794a1677c10f7d6d64298e0588a73e86af1d3dfdacb32a389a53ff7a4e408f9006006adc60e SHA512 437ff658c4ae4918fa73dee97773d9b8bf9b2dbfd4af3752ab3bdb735ded2508e449170e2aeea43d9bfbdb48e75d52154a847cb9a3a59e7f4b6ad0ec9027bfcd
 AUX nedit-5.7-doc.patch 522 BLAKE2B a52ae4cb7d9e2bb0b629024a0e5caf12e54f56905ee49fd2c1b83596e56aa403b5c1f71207e5f41c839de9070a2208e70e90e16a06119d744c8200a33d4747e0 SHA512 5ba978e599f34c348645d727a307ab9e68e666b3494daf380f177cb2f71aec5da94a8dd5884bf70aeae35ec1da31a7cccfc51812278c72935166fdf909ec9040
 AUX nedit-5.7-ldflags.patch 814 BLAKE2B 5d300f5006c41ef378d4cadfa2daa287034338c7e8cb692669873853f1082338af7eb0ef4295c823dfea7eb17f0920a9eace16f04c05dbdb6baa495b21e207de SHA512 2e72fb97f2bad7aec225cea2a86b2f0c40e22b8604bdc0288232df3b304c6a28924bf45425bf0ce3f3c753f7d2fb0133adbe041ff747093e2a6207c86378bd9c
-DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0
 DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932
 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
-EBUILD nedit-5.6-r1.ebuild 1977 BLAKE2B ab5c14e099bcaf0573493b6c9f73072427c3b77a876b79b62337b4001a93f0d59fa8139ec2be260f2ff5b8b2f982673ac00de5573241f68413f564760c566bb0 SHA512 6895f39046a30f9e55279622c7d9a1f33369f8a6a2e9244c0a20d11b9e6880c63bc5be1f98ed548c5e841500ec2db81a9b85f6db5c5fec90148ad0ff06e652f5
-EBUILD nedit-5.6-r2.ebuild 2027 BLAKE2B 08aeeb58ab2870a0dc8139b8eb0c7e218f22b46da0bb385185969ccba7808a52cf551a0549701d568be7ad88ad103f02b9507fc810c3cf90d2d73a1cb584c6a7 SHA512 038ef549923cad319852d95a704c4f0e946a3121f920b8d405817cf0bee7dac7ae6c11eb53e09cd9c95de2c665a9ca74d2b4092a518af9ef6b1673519c5ec123
-EBUILD nedit-5.7.ebuild 1983 BLAKE2B d4f3a244277aa4f9da9d5e6eaeb260c61462ea0aa27d89a3bdf4618ab2927f47d9917ade1b3c9a26cc468b66bfcd0b0d315c0c1daf4c93288a96849ec5c8f1e6 SHA512 b06ff9e0984de9b976f77cd64d2f4fccbf12db5542f82da57f23e14b6794a42635776b1067b903537dcb9f7a0ffd9c6e5e8bf9b823558bb5ac94db015d96ecaa
+EBUILD nedit-5.7.ebuild 1979 BLAKE2B 036681479e1073513c50afe5f06046481a7444ff6a167a83dadd1dc2bdb7a211d5850f5bceed21c01587d023e66353a956695049fd81c2a3ab97a4da6417dcf5 SHA512 82947270b1fdb7efea14b7de7bfe708ac6b17d7fed37444ac23a9ce79c0b66481cfb41e32c71eaf9746f98827e15829333bf2099920b439ed4b51fa9f9f3ee32
 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699
diff --git a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
deleted file mode 100644
index 9081ea340619..000000000000
--- a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: fix warning: cast from pointer to integer of different size
-# Origin: https://sourceforge.net/tracker/download.php?group_id=11005&atid=311005&file_id=340993&aid=2846694
-# Bug: https://sourceforge.net/tracker/?func=detail&atid=311005&aid=2846694&group_id=11005
-# Author: Jack Howarth <jwhowarth@users.sourceforge.net>
-
-@DPATCH@
-diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c
---- nedit-5.6~cvs20081118~/Xlt/SlideC.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/Xlt/SlideC.c	2009-09-15 22:05:42.000000000 +0200
-@@ -28,6 +28,7 @@
- #endif
- 
- #include <Xm/XmP.h>
-+#include <stdint.h>
- 
- #include "SlideCP.h"
- 
-@@ -116,14 +117,14 @@
- /* notify that initialize called    XtArgsProc        */ NULL,
- /* NULL                             XtProc            */ NULL,
- /* NULL                             XtPointer         */ NULL,
--/* NULL                             Cardinal          */ (Cardinal)NULL,
-+/* NULL                             Cardinal          */ (Cardinal)(uintptr_t)NULL,
- /* resources for subclass fields    XtResourceList    */ resources,
- /* number of entries in resources   Cardinal          */ XtNumber(resources),
- /* resource class quarkified        XrmClass          */ NULLQUARK,
--/* NULL                             Boolean           */ (Boolean)NULL,
--/* NULL                             XtEnum            */ (XtEnum)NULL,
--/* NULL				    Boolean           */ (Boolean)NULL,
--/* NULL                             Boolean           */ (Boolean)NULL,
-+/* NULL                             Boolean           */ (Boolean)(uintptr_t)NULL,
-+/* NULL                             XtEnum            */ (XtEnum)(uintptr_t)NULL,
-+/* NULL				    Boolean           */ (Boolean)(uintptr_t)NULL,
-+/* NULL                             Boolean           */ (Boolean)(uintptr_t)NULL,
- /* free data for subclass pointers  XtWidgetProc      */ destroy,
- /* NULL                             XtProc            */ NULL,
- /* NULL			            XtProc            */ NULL,
-diff -urNad nedit-5.6~cvs20081118~/source/file.c nedit-5.6~cvs20081118/source/file.c
---- nedit-5.6~cvs20081118~/source/file.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/file.c	2009-09-15 22:06:42.000000000 +0200
-@@ -52,6 +52,7 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
- 
-@@ -1914,7 +1915,7 @@
-     if (XmToggleButtonGetState(w)) {
-         XtPointer userData;
-         XtVaGetValues(w, XmNuserData, &userData, NULL);
--        *(int*) clientData = (int) userData;
-+        *(int*) clientData = (int) (uintptr_t) userData;
-     }
- }
- 
-diff -urNad nedit-5.6~cvs20081118~/source/highlight.c nedit-5.6~cvs20081118/source/highlight.c
---- nedit-5.6~cvs20081118~/source/highlight.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/highlight.c	2009-09-15 22:07:06.000000000 +0200
-@@ -49,6 +49,7 @@
- #include <limits.h>
- #include <math.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #ifdef VMS
- #include "../util/VMSparam.h"
-@@ -512,7 +513,7 @@
-     if (!pattern) {
- 	return NULL;
-     }
--    return (void*)pattern->userStyleIndex;    
-+    return (void*)(uintptr_t)pattern->userStyleIndex;    
- }
-     
- /*
-diff -urNad nedit-5.6~cvs20081118~/source/macro.c nedit-5.6~cvs20081118/source/macro.c
---- nedit-5.6~cvs20081118~/source/macro.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/macro.c	2009-09-15 22:07:27.000000000 +0200
-@@ -60,6 +60,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -2924,7 +2925,7 @@
-         readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
-     	btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
-     	    	XmNlabelString, s1=XmStringCreateSimple(btnLabel),
--    	    	XmNuserData, (XtPointer)(i+1), NULL);
-+    	    	XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
-     	XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
-     	XmStringFree(s1);
-     }
-@@ -2965,7 +2966,7 @@
-     	return; /* shouldn't happen */
-     if (XtClass(w) == xmPushButtonWidgetClass) {
- 	XtVaGetValues(w, XmNuserData, &userData, NULL);
--	retVal.val.n = (int)userData;
-+	retVal.val.n = (int)(uintptr_t)userData;
-     } else
-     	retVal.val.n = 1;
-     retVal.tag = INT_TAG;
-@@ -3101,7 +3102,7 @@
-         readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
-     	btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
-     	    	XmNlabelString, s1=XmStringCreateSimple(btnLabel),
--    	    	XmNuserData, (XtPointer)(i+1), NULL);
-+    	    	XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
-     	XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
-     	XmStringFree(s1);
-     }
-@@ -3155,7 +3156,7 @@
-        returned in w. */
-     if (XtClass(w) == xmPushButtonWidgetClass) {
- 	XtVaGetValues(w, XmNuserData, &userData, NULL);
--	btnNum = (int)userData;
-+	btnNum = (int)(uintptr_t)userData;
-     } else
-     	btnNum = 1;
-     
-@@ -3680,7 +3681,7 @@
-       readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
-       btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
-               XmNlabelString, s1=XmStringCreateSimple(btnLabel),
--              XmNuserData, (XtPointer)(i+1), NULL);
-+              XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
-       XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
-       XmStringFree(s1);
-     }
-@@ -3760,7 +3761,7 @@
-        returned in w. */
-     if (XtClass(w) == xmPushButtonWidgetClass) {
-       XtVaGetValues(w, XmNuserData, &userData, NULL);
--      btnNum = (int)userData;
-+      btnNum = (int)(uintptr_t)userData;
-     } else
-       btnNum = 1;
-     
-diff -urNad nedit-5.6~cvs20081118~/source/preferences.c nedit-5.6~cvs20081118/source/preferences.c
---- nedit-5.6~cvs20081118~/source/preferences.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/preferences.c	2009-09-15 22:07:47.000000000 +0200
-@@ -58,6 +58,7 @@
- #include <ctype.h>
- #include <pwd.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -2296,7 +2297,7 @@
- 	XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
- 	for (n=0; n<(int)nItems; n++) {
-     	    XtVaGetValues(items[n], XmNuserData, &userData, NULL);
--    	    XmToggleButtonSetState(items[n], (int)userData == mode, False);
-+    	    XmToggleButtonSetState(items[n], (int)(uintptr_t)userData == mode, False);
- 	}
-     }
- }
-@@ -5148,7 +5149,7 @@
-             	xmToggleButtonGadgetClass, menu,
-             	XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
-  	    	XmNmarginHeight, 0,
--   		XmNuserData, (void *)i,
-+   		XmNuserData, (void *)(uintptr_t)i,
-     		XmNset, window->languageMode==i, NULL);
-         XmStringFree(s1);
- 	XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
-@@ -5169,14 +5170,14 @@
-     XtVaGetValues(w, XmNuserData, &mode, NULL);
-     
-     /* If the mode didn't change, do nothing */
--    if (window->languageMode == (int)mode)
-+    if (window->languageMode == (int)(uintptr_t)mode)
-     	return;
-     
-     /* redo syntax highlighting word delimiters, etc. */
- /*
-     reapplyLanguageMode(window, (int)mode, False);
- */
--    params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
-+    params[0] = (((int)(uintptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)(uintptr_t)mode]->name;
-     XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);
- }
- 
-diff -urNad nedit-5.6~cvs20081118~/source/regularExp.c nedit-5.6~cvs20081118/source/regularExp.c
---- nedit-5.6~cvs20081118~/source/regularExp.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/regularExp.c	2009-09-15 22:08:16.000000000 +0200
-@@ -88,6 +88,7 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- 
- #ifdef HAVE_DEBUG_H
-@@ -4157,7 +4158,7 @@
-       table [*c] = 1;
-    }
- 
--   table [(int) NULL] = 1; /* These       */
-+   table [(int)(uintptr_t) NULL] = 1; /* These       */
-    table [(int) '\t'] = 1; /* characters  */
-    table [(int) '\n'] = 1; /* are always  */
-    table [(int) ' ' ] = 1; /* delimiters. */
-diff -urNad nedit-5.6~cvs20081118~/source/userCmds.c nedit-5.6~cvs20081118/source/userCmds.c
---- nedit-5.6~cvs20081118~/source/userCmds.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/userCmds.c	2009-09-15 22:08:47.000000000 +0200
-@@ -49,6 +49,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <ctype.h>
- #ifdef VMS
-@@ -1116,7 +1117,7 @@
- 	    	XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
- 		dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
- 	    } else {
--		index = (int)userData - 10;
-+		index = (int)(uintptr_t)userData - 10;
- 		if (index <0 || index >= nMenuItems)
-     		    return;
- 		if (menuList[index]->input == FROM_SELECTION)
-@@ -1928,7 +1929,7 @@
-     	    XmNlabelString, st1,
-     	    XmNacceleratorText, st2,
-     	    XmNmnemonic, f->mnemonic,
--    	    XmNuserData, (XtPointer)(index+10), NULL);
-+    	    XmNuserData, (XtPointer)(uintptr_t)(index+10), NULL);
-     XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg);
-     XmStringFree(st1);
-     XmStringFree(st2);
-diff -urNad nedit-5.6~cvs20081118~/util/prefFile.c nedit-5.6~cvs20081118/util/prefFile.c
---- nedit-5.6~cvs20081118~/util/prefFile.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/util/prefFile.c	2009-09-15 22:04:14.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- #ifdef VMS
- #include "VMSparam.h"
- #else
-@@ -353,9 +354,9 @@
-       	*(int *)rsrcDescrip->valueAddr = 0;
-     	return False;
-       case PREF_STRING:
--	if ((int)strlen(string) >= (int)rsrcDescrip->arg)
-+	if ((int)strlen(string) >= (int)(uintptr_t)rsrcDescrip->arg)
-       	    return False;
--	strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
-+	strncpy(rsrcDescrip->valueAddr, string, (int)(uintptr_t)rsrcDescrip->arg);
-       	return True;
-       case PREF_ALLOC_STRING:
-       	*(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);
diff --git a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
deleted file mode 100644
index 92b0778e2ab2..000000000000
--- a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -urN a/source/highlightData.c b/source/highlightData.c
---- a/source/highlightData.c	2018-03-13 08:42:40.930188154 +0100
-+++ b/source/highlightData.c	2018-03-13 08:44:59.651196431 +0100
-@@ -1280,7 +1280,7 @@
-     XFontStruct *font;
-     
-     if (styleNo<0)
--        return GetDefaultFontStruct(window->fontList);
-+	return GetDefaultFontStruct(TheDisplay, window->fontList);
-     fontNum = HighlightStyles[styleNo]->font;
-     if (fontNum == BOLD_FONT)
-     	font = window->boldFontStruct;
-@@ -1289,10 +1289,10 @@
-     else if (fontNum == BOLD_ITALIC_FONT)
-     	font = window->boldItalicFontStruct;
-     else /* fontNum == PLAIN_FONT */
--    	font = GetDefaultFontStruct(window->fontList);
-+	font = GetDefaultFontStruct(TheDisplay, window->fontList);
-     
-     /* If font isn't loaded, silently substitute primary font */
--    return font == NULL ? GetDefaultFontStruct(window->fontList) : font;
-+    return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font;
- }
- 
- int FontOfNamedStyleIsBold(char *styleName)
-diff -urN a/source/text.c b/source/text.c
---- a/source/text.c	2018-03-13 08:42:40.931188154 +0100
-+++ b/source/text.c	2018-03-13 08:46:37.785202286 +0100
-@@ -778,9 +778,13 @@
-     textBuffer *buf;
-     Pixel white, black;
-     int textLeft;
--    int charWidth = fs->max_bounds.width;
--    int marginWidth = new->text.marginWidth;
--    int lineNumCols = new->text.lineNumCols;
-+    int charWidth;
-+    int marginWidth;
-+    int lineNumCols;
-+
-+    charWidth = fs->max_bounds.width;
-+    marginWidth = new->text.marginWidth;
-+    lineNumCols = new->text.lineNumCols;
-     
-     /* Set the initial window size based on the rows and columns resources */
-     if (request->core.width == 0)
-diff -urN a/source/window.c b/source/window.c
---- a/source/window.c	2018-03-13 08:42:40.937188155 +0100
-+++ b/source/window.c	2018-03-13 08:48:07.727207652 +0100
-@@ -1839,7 +1839,7 @@
- 
-     /* Change the primary font in all the widgets */
-     if (primaryChanged) {
--        font = GetDefaultFontStruct(window->fontList);
-+	font = GetDefaultFontStruct(TheDisplay, window->fontList);
-         XtVaSetValues(window->textArea, textNfont, font, NULL);
-         for (i=0; i<window->nPanes; i++)
-             XtVaSetValues(window->textPanes[i], textNfont, font, NULL);
-@@ -1861,7 +1861,7 @@
-        size appropriate for the new font, but only do so if there's only
-        _one_ document in the window, in order to avoid growing-window bug */
-     if (NDocuments(window) == 1) {
--	fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width;
-+	fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width;
- 	fontHeight = textD->ascent + textD->descent;
- 	newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth;
- 	newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight + 
-@@ -2244,7 +2244,7 @@
-             textNrows, rows, textNcolumns, cols,
-             textNlineNumCols, lineNumCols,
-             textNemulateTabs, emTabDist,
--            textNfont, GetDefaultFontStruct(window->fontList),
-+	    textNfont, GetDefaultFontStruct(TheDisplay, window->fontList),
-             textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
-             textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
-             textNwordDelimiters, delimiters,
-
---- a/util/misc.c	2018-03-13 08:50:54.892217626 +0100
-+++ b/util/misc.c	2018-03-13 08:56:50.346238834 +0100
-@@ -1018,7 +1018,7 @@
- ** a Motif font list.  Since Motif stores this, it saves us from storing
- ** it or querying it from the X server.
- */
--XFontStruct *GetDefaultFontStruct(XmFontList font)
-+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font)
- {
-     XFontStruct *fs;
-     XmFontContext context;
-@@ -1028,6 +1028,17 @@
-     XmFontListGetNextFont(context, &charset, &fs);
-     XmFontListFreeFontContext(context);
-     XtFree(charset);
-+
-+    /* FontList might be a render table with no only XFT fonts */ 
-+    if (fs == NULL) {
-+	fs = XLoadQueryFont(d, "fixed");
-+    }
-+
-+    if (fs == NULL) {
-+	fprintf(stderr, "Unabled to load any fallback fonts.\n");
-+	exit(EXIT_FAILURE);
-+    }
-+
-     return fs;
- }
-    
-diff -urN a/util/misc.h b/util/misc.h
---- a/util/misc.h	2018-03-13 08:50:54.890217626 +0100
-+++ b/util/misc.h	2018-03-13 08:55:52.790235400 +0100
-@@ -65,7 +65,7 @@
- void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer);
- void UpdateAccelLockPatch(Widget topWidget, Widget newButton);
- char *GetXmStringText(XmString fromString);
--XFontStruct *GetDefaultFontStruct(XmFontList font);
-+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font);
- XmString* StringTable(int count, ...);
- void FreeStringTable(XmString *table);
- void SimulateButtonPress(Widget widget);
-
diff --git a/app-editors/nedit/files/nedit-5.6-format.patch b/app-editors/nedit/files/nedit-5.6-format.patch
deleted file mode 100644
index e2d6e17a6470..000000000000
--- a/app-editors/nedit/files/nedit-5.6-format.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nedit-5.6/source/nc.c.format nedit-5.6/source/nc.c
---- nedit-5.6/source/nc.c.format	2014-12-28 13:56:20.000000000 +0000
-+++ nedit-5.6/source/nc.c	2015-06-17 07:30:25.617032345 +0100
-@@ -503,7 +503,7 @@ static int startServer(const char *messa
-     
-     /* prompt user whether to start server */
-     if (!Preferences.autoStart) {
--	printf(message);
-+	printf("%s", message);
- 	do {
-     	    c = getc(stdin);
- 	} while (c == ' ' || c == '\t');
diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch
deleted file mode 100644
index a549b02490c0..000000000000
--- a/app-editors/nedit/files/nedit-5.6-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/source/Makefile.common	2004-03-21 15:25:56.000000000 +0100
-+++ b/source/Makefile.common	2009-10-24 10:47:03.667835157 +0200
-@@ -21,12 +21,12 @@
- # we only want natural rebuilds to regenerate the link date.
- nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
- 	$(CC) $(CFLAGS) -c linkdate.c
--	$(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
- 	 $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@
- 
- # Note LIBS isn't quite right here; it links unnecessarily against Motif
- nc: nc.o server_common.o ../util/libNUtil.a
--	$(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
- 
- help.o: help.c
- 	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
deleted file mode 100644
index 53a8b6f139cf..000000000000
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/nedit"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	|| ( dev-util/yacc sys-devel/bison )
-	dev-lang/perl"
-
-S="${WORKDIR}/${PN}-5.6"
-
-src_prepare() {
-	#respecting LDFLAGS, bug #208189
-	epatch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-40_Pointer_to_Integer.patch \
-		"${FILESDIR}"/${P}-security.patch
-	sed \
-		-e "s:bin/:${EPREFIX}/bin/:g" \
-		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
-	sed \
-		-e "s:nc:neditc:g" -i doc/nc.pod || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
-		makefiles/Makefile.linux || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
-		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
-		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
-		   -e "s:check_tif_rule::"                             \
-		makefiles/Makefile.macosx || die
-
-	epatch_user
-}
-
-src_compile() {
-	case "${CHOST}" in
-		*-darwin*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
-			;;
-		*-linux*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
-			;;
-	esac
-	emake VERSION="NEdit ${PV}" -C doc all
-}
-
-src_install() {
-	dobin source/nedit
-	newbin source/nc neditc
-
-	make_desktop_entry "${PN}"
-	doicon "${WORKDIR}/${PN}.png"
-
-	newman doc/nedit.man nedit.1
-	newman doc/nc.man neditc.1
-
-	dodoc README ReleaseNotes ChangeLog
-	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
-	dohtml doc/nedit.html
-}
diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
deleted file mode 100644
index 018a58628a32..000000000000
--- a/app-editors/nedit/nedit-5.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/nedit"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	|| ( dev-util/yacc sys-devel/bison )
-	dev-lang/perl"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-format.patch"
-	  "${FILESDIR}/${P}-ldflags.patch"
-	  "${FILESDIR}/${P}-40_Pointer_to_Integer.patch"
-	  "${FILESDIR}/${P}-security.patch"
-	  "${FILESDIR}/${P}-fix-crash-with-noX.patch"
-)
-
-src_prepare() {
-	#respecting LDFLAGS, bug #208189
-	default
-	sed \
-		-e "s:bin/:${EPREFIX}/bin/:g" \
-		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
-	sed \
-		-e "s:nc:neditc:g" -i doc/nc.pod || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
-		makefiles/Makefile.linux || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
-		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
-		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
-		   -e "s:check_tif_rule::"                             \
-		makefiles/Makefile.macosx || die
-}
-
-src_compile() {
-	case "${CHOST}" in
-		*-darwin*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
-			;;
-		*-linux*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
-			;;
-	esac
-	emake VERSION="NEdit ${PV}" -C doc all
-}
-
-src_install() {
-	dobin source/nedit
-	newbin source/nc neditc
-
-	make_desktop_entry "${PN}"
-	doicon "${WORKDIR}/${PN}.png"
-
-	newman doc/nedit.man nedit.1
-	newman doc/nc.man neditc.1
-
-	dodoc README ReleaseNotes ChangeLog
-	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
-	dohtml doc/nedit.html
-}
diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild
index 25f9ab97f1db..f8a265fc947a 100644
--- a/app-editors/nedit/nedit-5.7.ebuild
+++ b/app-editors/nedit/nedit-5.7.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/motif-2.3:0
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 6d227614828d..4053762bc58e 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,5 @@
-DIST okteta-0.26.4.tar.xz 969572 BLAKE2B 37f3a0c83c3a922030816813de9a66edff0f4a1ae9f3450f9fe195b52d1b053c23f37c8fb2a06b08ef8df47061123536f202809b3d4954d824103dfb1b912559 SHA512 2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7
 DIST okteta-0.26.5.tar.xz 971940 BLAKE2B 44313d9603b15e9b9c4355b34d3d3b778c6530de7bfb2ab2589716c5123a5c66116d1cc8aa8197fb55135fb4dd6eca89155ec3c5f18b14e5f88c664f2197de4b SHA512 9a4934f8f4508bd858f8ed13f02174b211453ec5b38aa0fcc62d1173e3a0e0101754d23f53ce4bddcfe9106eeaed687f1141d2a1a65efc3ea8478e5d1840dc09
-EBUILD okteta-0.26.4.ebuild 1748 BLAKE2B 2dde9f4114d76cf744609ee57879ddcf4a4d1a7cddba1ee11a954c4bab2f07d8abf36970c333c24e9db73281bb764210cbfda67bdc1787bbfc4be3a1347258b1 SHA512 843900a57980eddaa49d34ab1912b34868a0020e5d4243aa2247fda2883128336a7cbb037b755164200cf53843b6221f8512c5108e38873e178021038427917f
-EBUILD okteta-0.26.5.ebuild 1750 BLAKE2B 74155ad1b5f24168a1dc0c7d22a70d08eae09d30b236bda0f6c29c420384c2a4d958413807ad5c511cfde3829f6504f6ee3701cf4f3d083a8c104e368508c90e SHA512 a0ffbe6000332e69ef8d1f36c2865c573573cb4e1ce71138a6618361a0e49e0039f0c96a6f70d844ffa7651cc21cd2a31772390c1fa95af4e5869ac35453335b
+DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a
+EBUILD okteta-0.26.5.ebuild 1748 BLAKE2B b233026aab3756a5e9dd27120abc2ee34dbcab2160eae4cebf0a2ef64569191b2c125be3f14e6de119d4944d8f7128ef511ed04dae1ab7225d7bbb4ff2a247a9 SHA512 5524e291de5f5245b44e1fea7a62ce4533ed01e8d383f500e3d9f74b5c3ecf114033a0d86b760e0b92c74f7bedd688e209b28b8af1ac827e8ee7f7f28ef2d916
+EBUILD okteta-0.26.6.ebuild 1750 BLAKE2B 74155ad1b5f24168a1dc0c7d22a70d08eae09d30b236bda0f6c29c420384c2a4d958413807ad5c511cfde3829f6504f6ee3701cf4f3d083a8c104e368508c90e SHA512 a0ffbe6000332e69ef8d1f36c2865c573573cb4e1ce71138a6618361a0e49e0039f0c96a6f70d844ffa7651cc21cd2a31772390c1fa95af4e5869ac35453335b
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.5.ebuild b/app-editors/okteta/okteta-0.26.5.ebuild
index fbd056737062..e30d370eff35 100644
--- a/app-editors/okteta/okteta-0.26.5.ebuild
+++ b/app-editors/okteta/okteta-0.26.5.ebuild
@@ -17,7 +17,7 @@ https://utils.kde.org/projects/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-editors/okteta/okteta-0.26.4.ebuild b/app-editors/okteta/okteta-0.26.6.ebuild
index 8499c3c2e99b..fbd056737062 100644
--- a/app-editors/okteta/okteta-0.26.4.ebuild
+++ b/app-editors/okteta/okteta-0.26.6.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
@@ -6,8 +6,8 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,7 +17,7 @@ https://utils.kde.org/projects/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
@@ -50,7 +50,7 @@ DEPEND="
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( app-crypt/qca:2[qt5(+)] )
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 129f85d435df..b91cd18b817b 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
 DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
-EBUILD pluma-1.24.0.ebuild 1774 BLAKE2B f582ccaf011f733156549072a17481525ffb4b5244c9f6aed3328683efbdb24569a0d5af0997f458db126b3d911e1dd3bbd1403190ca010f9f98f8bd9fc9522e SHA512 6e8daa467c2e06f0c35ede543ef09bcf8bad59640e8513c42a750c718780ddd7d212da71169baf1573e4594a575ec3db13f0bd05a05d203fc96b4d50fc676f6b
-EBUILD pluma-1.24.1.ebuild 1784 BLAKE2B 71378355ce5d7732f411cd3a17ac8dcf1266a5407366c37d61e1b25a85cfbe710d1c8777d6dedf5615da0d9cb0ccebef6f8b07041b5e7a56f7e97403ce86c264 SHA512 ac4cb8004a83c15c0007c06aada12b805e64dafa7367ad0b722f0813bcf1d34279b40f51348b9d332c60dba220584a758bf51280af7c4cfe4e373410babcbed6
+EBUILD pluma-1.24.0.ebuild 1779 BLAKE2B b424d05f19cc53b723f74e2c0d10a013373df3110274292f644e3c57788f8d72942ecdfb44cbff27e3bff891c29766b4493ee55d0cc3c72f5683837b0c25be40 SHA512 16e7809f6b6467b8af68f3d85329920c793328bcfaddda90ca46489f79373339ebdff4c08c387433c2bbe065c4fe8530793dddc38b3939f19f350129ed2c91a3
+EBUILD pluma-1.24.1.ebuild 1789 BLAKE2B bb4279cea3ae284bea9882781855a997ba68dfa8879bccaf1520fc105b5cb1124abe54b719f741eb6173a11cfb66702f4b3633fa51254a79b2fc00190442d175 SHA512 d481ade08caba6522b9e3bae42028423d60d92e738d39e1d5093d5840abd0591fa5e8d0ed2706e8cbe407f7b2638411d674fb7390a7785eaf1b2e6bf6e08bee2
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
index dc5dc69ed090..66163bb8d8a0 100644
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ b/app-editors/pluma/pluma-1.24.0.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=6
@@ -77,5 +77,5 @@ src_test() {
 
 	unset DBUS_SESSION_BUS_ADDRESS
 
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
 }
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
index 3f2d02161ab5..9add36a506c2 100644
--- a/app-editors/pluma/pluma-1.24.1.ebuild
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -77,5 +77,5 @@ src_test() {
 
 	unset DBUS_SESSION_BUS_ADDRESS
 
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
 }
diff --git a/app-editors/sandy/Manifest b/app-editors/sandy/Manifest
index 475c043d66c0..ad6fe77195f8 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
+EBUILD sandy-0.4-r1.ebuild 781 BLAKE2B b684b53b3d1a47a31510ca8f967daeb82e0b6151959aa6826e725ae31404a1ea24b5e542b1710824f8043dcb992360058b5f66353c3879e6d925021eb55cff80 SHA512 be81a5921a61c5eb62e4067e22a9d5d3b4e72cc7ee33a25a50f1d86403b58ba058f9c81c1e81f0e19b622aba1783f43df2623d00cafc36a96c3bc01747954db4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/sandy/sandy-0.4-r1.ebuild b/app-editors/sandy/sandy-0.4-r1.ebuild
index d6f94b34f70f..9e28a7fcfea3 100644
--- a/app-editors/sandy/sandy-0.4-r1.ebuild
+++ b/app-editors/sandy/sandy-0.4-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
@@ -18,6 +18,10 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+BDEPEND="
+	virtual/pkgconfig
+"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4-gentoo.patch
 )
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index f1ebcd98a68c..2ff17bf842c0 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -1,5 +1,8 @@
+AUX ted-2.23-0001-pass-MAKE-to-subdir.patch 776 BLAKE2B edf6f29cfa1dc849aa1813fecc563d7bf9cff41b5de35a3f83cb0955b2f7d4c2aa3f382804a022d6e14557599e621046cde8ce3654e0f01b3508e719567bc19b SHA512 c0b21837331b402bacac1d64ea9e0a424454788c3290c7e098f7b65f53c2c6bf4b657f697ac6cb579f963ab8588fd8b630a479730644dd93a710a03f04cc4548
+AUX ted-2.23-0002-fix-unrecognized-option-with-GTK.patch 3444 BLAKE2B c5b8c44ad1c0dd99bfa3f3e3009de209ff7327548df2c1d3f79b135c2967dd5e12167ca623874d02c5542b4f8ff18dd5bc33f02811771661a727ca4fdb08cb97 SHA512 c48952f8bc4c74a0c3656e3ab357de79be6f4e41b10aaddf89c88ad246658478c0f5028d2c1f10508904e83a5e90059231542adeeebbb076b2c6a88769d60814
+AUX ted-2.23-0003-avoid-compressing-man-page.patch 1116 BLAKE2B 861d52809598d0e97d72fa0df396e8712e7cc0d9477fa6df37668988ad2c4cd08515eb61a1fe2a3140c7a7bffe26e9b2f406a02d1a136c8000e91d1585b190d2 SHA512 4fc2599b629d87b285eac60da9da0e27a77d9d19b6dfa39c969327ec42827ac736e1211cc573711b037db2a3ac93f446284e5f189557e82983e930ecbf79eb88
 AUX ted-2.23-freetype261.patch 273 BLAKE2B 3a9b52da5de4b8d991298c438a5589b1c70e70b0733d561f0a0c259b7eb1cd39b418d6f472bfb24534b24f19bfe83623827c16a371dece16dd33171369006da7 SHA512 f8523865ad47a552d000ee14380c40ffe22cdd5287cb6fd6f79b7afe4a6ae4742aaa999c9c4d2d79e00b538f5b83106ebeb24f1aa25cabb656418759db9c0921
-AUX ted-2.23-make.patch 418 BLAKE2B 2bc3a66a99f00caa793c81b4f3beb8935deff183cc0ddba613348010547e2b715eae169309acfc286b5690550fc892b9f1ff99bcdad673779b2c23b192da22db SHA512 a1dc77b4788a71445cb30db010d1413e11c06861c692137747d2d02d1cd16b07fb3dd05e702fd37aad600432a985c86d785465a2fe6ddbe6f506b16cafb80b01
+AUX ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch 637 BLAKE2B bf905f5e5609b014256519587a7b640dfcf8fb0c45739a71df8fdbb3a269c834fa4aa96dc00bec79e63268e57faf9d5ded9568e72561e1f817cf7e630d1d1c1a SHA512 3e2c7ff378f9a537601cf3422c83deb32aa907bbaf80a6b87c68dee5b1fe44c90880230303b38eb9c6095ff5932d6e26fc764f8e69aac85241aadc4b44ee126b
 DIST ted-2.23.src.tar.gz 4672208 BLAKE2B ca5f0e0a6a1d00a50da6986455faedbb20cc1246737233c8a3a161b4f653c53b1647c7fb41c774082116ed3e4a0736f8dd35504a54a92dd8e6a6e9124e6e9850 SHA512 c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
-EBUILD ted-2.23.ebuild 1551 BLAKE2B 3836f195b3c50996ad71c03996c6e645d4f5bd10c0822f9019735d9c88330a4d0facf052aeed1c7de73bd651c415fda50d5dd19fbd17f5441e23b60238adedf4 SHA512 7fa9fd2639886020f696af78fba7d0894e70e09a9b0417c17f01c637560d84ce6ef40d23db8bbc1c538f45e8ea71aea834c75c4220d814d6fa54baf1556907d5
+EBUILD ted-2.23-r1.ebuild 2081 BLAKE2B 3774e4ec51cdd60ef3f966847f68a20f298aceb49b0a14052ae0a2508048036ffc52d66d739e6381d7471718aea138b0446d98dfe9a4404b367999e431b1fc3a SHA512 7b1b2d322c7be9e1205748b00b3c94686129f75e2e9262e56cb0e8418722ede1465e4f4b5237d612f0945990a5baf2d9c9427546baf4a1d5e79074b73d86ddc3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/ted/files/ted-2.23-0001-pass-MAKE-to-subdir.patch b/app-editors/ted/files/ted-2.23-0001-pass-MAKE-to-subdir.patch
new file mode 100644
index 000000000000..2075febd06b2
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-0001-pass-MAKE-to-subdir.patch
@@ -0,0 +1,26 @@
+From 570129a519e2b22d900ecf06ed938b7b5d5a7b79 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:04:15 +0200
+Subject: [PATCH] pass $(MAKE) to subdir
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..19f3f49 100644
+--- a/Makefile
++++ b/Makefile
+@@ -246,7 +246,7 @@ package: compile tedPackage/makefile
+ 	: To install Ted, you can now run 'make install' AS ROOT
+ 
+ package.shared: compile.shared tedPackage/makefile
+-	cd tedPackage && make package.shared
++	cd tedPackage && $(MAKE) package.shared
+ 	:
+ 	: Dynamically linked package ready.
+ 	: To install Ted, you can now run 'make install' AS ROOT
+-- 
+2.31.1
+
diff --git a/app-editors/ted/files/ted-2.23-0002-fix-unrecognized-option-with-GTK.patch b/app-editors/ted/files/ted-2.23-0002-fix-unrecognized-option-with-GTK.patch
new file mode 100644
index 000000000000..26360535c141
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-0002-fix-unrecognized-option-with-GTK.patch
@@ -0,0 +1,134 @@
+From 75913fec2f0b168d08c28eaa84fd69f52767802d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 10:54:08 +0200
+Subject: [PATCH] fix unrecognized option --with-GTK
+
+Closes: https://bugs.gentoo.org/470652
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..b210d8a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -128,84 +128,84 @@ lib/bitmap.a: bitmap/makefile
+ 	cd bitmap && $(MAKE)
+ 
+ bitmap/makefile: bitmap/makefile.in Makefile
+-	cd bitmap && ./configure $(CONFIGURE_OPTIONS)
++	cd bitmap && ./configure
+ 
+ ####
+ lib/docBuf.a: docBuf/makefile
+ 	cd docBuf && $(MAKE)
+ 
+ docBuf/makefile: docBuf/makefile.in Makefile
+-	cd docBuf && ./configure $(CONFIGURE_OPTIONS)
++	cd docBuf && ./configure
+ 
+ ####
+ lib/docBase.a: docBase/makefile
+ 	cd docBase && $(MAKE)
+ 
+ docBase/makefile: docBase/makefile.in Makefile
+-	cd docBase && ./configure $(CONFIGURE_OPTIONS)
++	cd docBase && ./configure
+ 
+ ####
+ lib/docHtml.a: docHtml/makefile
+ 	cd docHtml && $(MAKE)
+ 
+ docHtml/makefile: docHtml/makefile.in Makefile
+-	cd docHtml && ./configure $(CONFIGURE_OPTIONS)
++	cd docHtml && ./configure
+ 
+ ####
+ lib/docLayout.a: docLayout/makefile
+ 	cd docLayout && $(MAKE)
+ 
+ docLayout/makefile: docLayout/makefile.in Makefile
+-	cd docLayout && ./configure $(CONFIGURE_OPTIONS)
++	cd docLayout && ./configure
+ 
+ ####
+ lib/docRtf.a: docRtf/makefile
+ 	cd docRtf && $(MAKE)
+ 
+ docRtf/makefile: docRtf/makefile.in Makefile
+-	cd docRtf && ./configure $(CONFIGURE_OPTIONS)
++	cd docRtf && ./configure
+ 
+ ####
+ lib/docEdit.a: docEdit/makefile
+ 	cd docEdit && $(MAKE)
+ 
+ docEdit/makefile: docEdit/makefile.in Makefile
+-	cd docEdit && ./configure $(CONFIGURE_OPTIONS)
++	cd docEdit && ./configure
+ 
+ ####
+ lib/ind.a: ind/makefile
+ 	cd ind && $(MAKE)
+ 
+ ind/makefile: ind/makefile.in Makefile
+-	cd ind && ./configure $(CONFIGURE_OPTIONS)
++	cd ind && ./configure
+ 
+ ####
+ lib/appUtil.a: appUtil/makefile
+ 	cd appUtil && $(MAKE)
+ 
+ appUtil/makefile: appUtil/makefile.in Makefile
+-	cd appUtil && ./configure $(CONFIGURE_OPTIONS)
++	cd appUtil && ./configure
+ 
+ ####
+ lib/textEncoding.a: textEncoding/makefile
+ 	cd textEncoding && $(MAKE)
+ 
+ textEncoding/makefile: textEncoding/makefile.in Makefile
+-	cd textEncoding && ./configure $(CONFIGURE_OPTIONS)
++	cd textEncoding && ./configure
+ 
+ ####
+ lib/utilPs.a: utilPs/makefile
+ 	cd utilPs && $(MAKE)
+ 
+ utilPs/makefile: utilPs/makefile.in Makefile
+-	cd utilPs && ./configure $(CONFIGURE_OPTIONS)
++	cd utilPs && ./configure
+ 
+ ####
+ lib/docFont.a: docFont/makefile
+ 	cd docFont && $(MAKE)
+ 
+ docFont/makefile: docFont/makefile.in Makefile
+-	cd docFont && ./configure $(CONFIGURE_OPTIONS)
++	cd docFont && ./configure
+ 
+ ####
+ lib/appFrame.a: appFrame/makefile
+@@ -219,7 +219,7 @@ lib/drawMeta.a: drawMeta/makefile
+ 	cd drawMeta && $(MAKE)
+ 
+ drawMeta/makefile: drawMeta/makefile.in Makefile
+-	cd drawMeta && ./configure $(CONFIGURE_OPTIONS)
++	cd drawMeta && ./configure
+ 
+ ####
+ ####	Compile and link Ted
+@@ -252,7 +252,7 @@ package.shared: compile.shared tedPackage/makefile
+ 	: To install Ted, you can now run 'make install' AS ROOT
+ 
+ tedPackage/makefile: tedPackage/makefile.in Makefile
+-	cd tedPackage && ./configure $(CONFIGURE_OPTIONS)
++	cd tedPackage && ./configure
+ 
+ sysvpkg: compile tedPackage/makefile
+ 	cd tedPackage && $(MAKE) $@
+-- 
+2.31.1
+
diff --git a/app-editors/ted/files/ted-2.23-0003-avoid-compressing-man-page.patch b/app-editors/ted/files/ted-2.23-0003-avoid-compressing-man-page.patch
new file mode 100644
index 000000000000..d4f7b24b8924
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-0003-avoid-compressing-man-page.patch
@@ -0,0 +1,32 @@
+From 38fc26c86b07f2d9404fe80ff758a92b2a9cfc85 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:22:28 +0200
+Subject: [PATCH] avoid compressing man page
+
+Fix a QA issue
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ tedPackage/makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tedPackage/makefile.in b/tedPackage/makefile.in
+index 2b39dd2..a1040ca 100644
+--- a/tedPackage/makefile.in
++++ b/tedPackage/makefile.in
+@@ -194,9 +194,9 @@ datadir:	README		\
+ 	( cd $(PKGDATADIR)/Ted && umask 0 && tar xvf - ) < TedDatadir.tar
+ 	cp $(PKGDATADIR)/Ted/TedDocument-en_US.rtf TedDocument-en_US.rtf
+ 	( umask 022 && mkdir -p $(PKGMANDIR) )
+-	sh ./customize.sh $(CUSTOMIZE_ARGS) < $(PKGDATADIR)/Ted/doc/Ted.1 | \
+-					    gzip -9 > $(PKGMANDIR)/Ted.1.gz
+-	chmod 644 $(PKGMANDIR)/Ted.1.gz
++	sh ./customize.sh $(CUSTOMIZE_ARGS) < $(PKGDATADIR)/Ted/doc/Ted.1 \
++					    > $(PKGMANDIR)/Ted.1
++	chmod 644 $(PKGMANDIR)/Ted.1
+ 	:
+ 	cp $(PKGLSMNAME) $(PKGTEDVARIADIR)/$(PKGLSMNAME)
+ 	cp Ted.desktop $(PKGDESKTOPDIR)/Ted.desktop
+-- 
+2.31.1
+
diff --git a/app-editors/ted/files/ted-2.23-make.patch b/app-editors/ted/files/ted-2.23-make.patch
deleted file mode 100644
index f97093b47648..000000000000
--- a/app-editors/ted/files/ted-2.23-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2013-04-01 13:24:45.854051804 +0400
-+++ Makefile	2013-04-01 13:25:02.618052336 +0400
-@@ -246,7 +246,7 @@
- 	: To install Ted, you can now run 'make install' AS ROOT
- 
- package.shared: compile.shared tedPackage/makefile
--	cd tedPackage && make package.shared
-+	cd tedPackage && $(MAKE) package.shared
- 	:
- 	: Dynamically linked package ready.
- 	: To install Ted, you can now run 'make install' AS ROOT
diff --git a/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch b/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch
new file mode 100644
index 000000000000..362c3b22186b
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch
@@ -0,0 +1,26 @@
+From 4368f7bab3a79b4322c1c19fdb99634e10f823ad Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:36:06 +0200
+Subject: [PATCH] use Motif toolkit instead of GTK by default
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..f6ced83 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@
+ ####	P.S.	I admit that this makefile is more like a shell script.
+ ####
+ 
+-CONFIGURE_OPTIONS=--with-GTK
++CONFIGURE_OPTIONS=--with-MOTIF
+ 
+ compile:	tedlibs		\
+ 		Ted/Ted		\
+-- 
+2.31.1
+
diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23-r1.ebuild
index 41d6280abf91..6ad6952c107d 100644
--- a/app-editors/ted/ted-2.23.ebuild
+++ b/app-editors/ted/ted-2.23-r1.ebuild
@@ -1,31 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs xdg-utils
+EAPI=7
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="X-based rich text editor"
 HOMEPAGE="https://www.nllgg.nl/Ted/"
 SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
+S="${WORKDIR}/Ted-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-RDEPEND="x11-libs/gtk+:2
-	media-libs/tiff:=
-	virtual/jpeg:=
+RDEPEND="
+	app-text/libpaper
+	dev-libs/libpcre2
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libpng:=
+	media-libs/tiff:=
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/libiconv
 	x11-libs/libXft
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Ted-${PV}"
+	x11-libs/libXpm
+	x11-libs/motif
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-pass-MAKE-to-subdir.patch
+	"${FILESDIR}"/${P}-0002-fix-unrecognized-option-with-GTK.patch
+	"${FILESDIR}"/${P}-0003-avoid-compressing-man-page.patch
+	"${FILESDIR}"/${P}-freetype261.patch
+	"${FILESDIR}"/${P}-use-Motif-toolkit-instead-of-GTK-by-default.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch \
-		"${FILESDIR}"/${P}-freetype261.patch
+	default
 
 	sed -i -e 's|/Ted/|/share/Ted/|' \
 		"${S}"/appFrame/appFrameConfig.h.in \
@@ -50,10 +67,14 @@ src_configure() {
 	tc-export AR CC RANLIB
 
 	local dir
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
-		cd "${S}"/${dir}
+	for dir in appUtil textEncoding utilPs bitmap docFont docBase docBuf ind drawMeta docRtf docEdit docLayout docHtml; do
+		cd "${S}"/${dir} || die
 		econf --cache-file=../config.cache
 	done
+	for dir in appFrame; do
+		cd "${S}"/${dir} || die
+		econf --cache-file=../config.cache --with-MOTIF
+	done
 }
 
 src_compile() {
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index c89ae8215816..a57dfb990e32 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,5 +1,7 @@
 AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae631f709b651519298af624d6a9a28d13ebbe03f707351c9d51bebee2a198d35b8a8e709d574a99f751521dd SHA512 8cdc834a2d0d8d843e326a825a13418c765079ec41c15f1fe5b7a3eb2c158928db594ba7d7e946dd72a936af4bf86a302dd5b042fad64d20fe033f2b64dea3e8
 AUX texworks-0.6.5-cmake_lua_version.patch 219 BLAKE2B c09494099363fa26e4110c23b0e1c06caf44cb0040578bfa33457741fdc8fe4698a2f4000a6dc6da4cd19dca6039c251cd1b875a27dc41abfea03b5cb79c341a SHA512 66ccbbcf313596c674833b36f222c8aa8bde541dfd58a706814aef3eaeec50247bec954a4f7137dfda31df9cd7b15163200592acb8433ed252d961ebf2b9ea32
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
+DIST texworks-0.6.6.tar.gz 12385550 BLAKE2B 241a9e4649e489964c62bd44ca310ffa7d67ebcb6187568dbf5e5b7916d81e3d846f0492a22e35d2c8a57d182d32d129600570e3836c671ae723c236f82d6bd8 SHA512 65300dfbe4e0e2f3b387c868e343f6caeff4602b47afee5a02cce82e0e23b74fe559b4b54fb65d778748de56f38581305a9b3a53d743c957b7dc14ecce4546d1
 EBUILD texworks-0.6.5-r100.ebuild 1699 BLAKE2B 458e239d6971c1935652e86492283c181b6a2cf9551dfb1d2f20285fca135a816831e59a4f4939d7e7ba46d591091f73f02669c00ec08ca4adaec4a618215820 SHA512 5d5ecfda46878edbee8709471250c925aa04492f4d9b7e6edbb2d99a64c233dc740713f5c2163e46d653b1b9ab34761d8f003ab87f0947e9c19ebcddf58c2497
+EBUILD texworks-0.6.6.ebuild 1665 BLAKE2B 95742344886e75c3e5d605a623b65cb3f71f50ac2d0226888e92899376eacd1feebff1ad9bd10fdcb90122bc3cff763419e45840cd043a8352d6a175054497ef SHA512 b3c751560c0fa366ed0ce6a028893071a56b7aa94a1eadfcf0fc22239f692e6d91a8a9e1e36688d9fe40b77547f104691af80214b067ac0ad53011dd8ac7b287
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.6.ebuild b/app-editors/texworks/texworks-0.6.6.ebuild
new file mode 100644
index 000000000000..f130e1a29fa8
--- /dev/null
+++ b/app-editors/texworks/texworks-0.6.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit lua-single python-single-r1 cmake virtualx xdg-utils
+
+DESCRIPTION="A simple interface for working with TeX documents"
+HOMEPAGE="http://tug.org/texworks/"
+SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua python"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5[scripttools]
+	lua? ( ${LUA_DEPS} )
+	python? ( ${PYTHON_DEPS} ) "
+
+DEPEND="dev-qt/linguist-tools:5
+	${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
+
+RESTRICT="!test? ( test )"
+
+CMAKE_REMOVE_MODULES_LIST="FindLua"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+		-DPREFER_BUNDLED_SYNCTEX=ON
+		-DWITH_LUA=$(usex lua ON OFF)
+		-DWITH_PYTHON=$(usex python ON OFF)
+		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
+		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
+		-DQTPDF_VIEWER=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_SHARED_PLUGINS=ON
+	)
+	use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
+	cmake_src_configure
+}
+
+src_test() {
+	virtx default_src_test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index e8e4305acc95..c09d54d59d86 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,6 +16,6 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r2.ebuild 7132 BLAKE2B 9be4cd45796c4a902cc0af0c42a9b1b63b8de00f7f25534b9e8fe0fe5dc1f81710eba92cece392c9f3dc63d65c6bee55c18e7b6b921f1f429856e2dae41198b3 SHA512 f45f7723262cc308d8caaff4c62edc436f008b0f0f11f5e107cab849d99cd868a9f88d1193d38b975fab597d01d2a4a9406078442872e1f93a334707946908ba
-EBUILD xemacs-21.5.34-r5.ebuild 7439 BLAKE2B 8a08013b02e953e0de1b7806bd964bdcabe8eac599476eec4bb8001b4a412ef7357f5ddbf489843d2d69db2cbe1677e4e01efc22392413da0cfbb6eb5c124ee6 SHA512 321265fcb6426883567157a7711a0dc81a263f2174ace7909165bceab641f55c013437f1a04c45987168f934d505a468a3d9f1de2347d9766cfc575eef6349d1
+EBUILD xemacs-21.4.24-r2.ebuild 7125 BLAKE2B 929ec8036ea1a05852199eca6b717ab8c0d390d7f33063cfb220f055aa45e6ea51324edccd73d65a4b9bebf6072f07e65d40d1471d10abefd57f6c915bb27921 SHA512 f0a76a418850c782730766d3fed0e04ec7c9350b7d2c5150348e6e44d0548c4f6ba8837fb8f97c6448deb866f7384b09038a93bfe9a7579f7f41b918b8d02d5f
+EBUILD xemacs-21.5.34-r5.ebuild 7423 BLAKE2B 998381d0defa89226834b2777ff69127c7416a9156050b1cc9650e37bd8d0663e2285406019f21c87244d2291c308e7c508eb06543b23e1d61e860d61b1a2e89 SHA512 80107e97cc4bc79ec720981c10b0b69bafaafde1d8e4b63bccd0c1d1151a34f05f2590813b2def7001ac585c36f8f956fbbd7e10db05ab3577aad91c19ef9a7f
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 22186d5e0150..557ca34677b6 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.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
 
 # Note: xemacs currently does not work with position independent code
@@ -7,7 +7,7 @@
 EAPI=7
 
 WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop
+inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
 HOMEPAGE="http://www.xemacs.org/"
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 91fe80f8bfe7..51534cc420ba 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit autotools eutils flag-o-matic multilib xdg-utils desktop
+inherit autotools flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
 HOMEPAGE="http://www.xemacs.org/"
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 875e7e159f03..230374da7cc7 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,4 +1,4 @@
 AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 882 BLAKE2B 352b538f0637fbdec5efd8c34029b25f9c74b05c6ca20363e5a03a48ab80ba7042c037bf3dd291708157d4426249932e3e3243d4fe409009db8f25423537a025 SHA512 94ece0feba37eb20e255e9305de6925b615b340e1d98c9cc071590a81e85b53e9a0d178aff2350ad7fab52c59bbf64c1c57dd4a2b403b9f9fd9f3b3dfba2e192
+EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 929 BLAKE2B e7cf454f41a7d9b4b8817b041356b9d8d6a99859fa8be27e7169bc64c13e25943fb982ebfca3888b6e7ff140dd0ec051db99f63469040ca81fc10e50453d22e9 SHA512 a0e4a5ea8048f4c8ab20764167ff36516135e01ab1c3faf4660acf98a36cf98e4dfb16f3c570cca613bff7474822558368dc9fae7634ce6d13952bbd2483d94c
 MISC metadata.xml 250 BLAKE2B 113a0d77e4ddd91ae5487bc89371d2973202f242a3c9a8899725295e62b51c0a64437ab158b40ba410c671f92fe3efb896b1446f7301e1f1e923baece1cb7e04 SHA512 20703a39d4150e2a8984fdaeb997da464e98e6abc363e5e07fee46954d5af19c861e40648fb238b763420349e3ebeaa4bf61a621ccff3ff77d6e629c61095bb0
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
index 08f5b2c7e7a9..740c3a09313e 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-WX_GTK_VER="3.0"
+EAPI=7
 
+WX_GTK_VER="3.0"
 inherit autotools wxwidgets xdg
 
 DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
@@ -21,12 +21,10 @@ RDEPEND="
 	dev-libs/libxslt
 	dev-libs/xerces-c[icu]
 	dev-libs/libpcre
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/intltool
-"
+	dev-libs/boost"
+BDEPEND="dev-util/intltool"
 
 PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch )
 
@@ -36,10 +34,11 @@ src_prepare() {
 	# bug #440744
 	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
 	eautoreconf
-
-	need-wxwidgets unicode
 }
 
 src_configure() {
-	econf $(use_enable nls)
+	setup-wxwidgets unicode
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_enable nls)
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /app-editors
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)