gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /app-editors
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
30 files changed, 222 insertions, 1019 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 91be73f682a4..5705e554ff18 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 579c7b038c02..f4e4cf29ee36 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,6 +1,4 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
-DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
 DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
-EBUILD bluefish-2.2.10.ebuild 2556 BLAKE2B 910fea9618911f35362e3162fb4c16e1eea08c954898500bf30256b49c194513aef6185b506d91fa1996b795d9dbfc96a4b14411ab677c364c4bf3bf176a6598 SHA512 e84bd7bc879ec41696fceb944a525d8d6b7ffbe0a339f1c6da3c20cd96bbfa551a832800095d794a4c0837aeeb359371db6d7698de01130459be375dd855eb04
-EBUILD bluefish-2.2.12.ebuild 2621 BLAKE2B b966f08b414d5ff14b122bfb523148eac36a2fd013a4a410d36b732c3b1f432e00d6b03774b2e40036faaff94154495d813dccf52a9012eb43274d5e9d608651 SHA512 50b04c1ed5b327949ab31fe2663ecc57d6f01fd2ab766086169466f0a49f25a25f07ae2584d060442485ba60f00939937feba59454fd469b0c6da5da506bf137
-MISC metadata.xml 386 BLAKE2B d8663af89654394ea695c309c2ebbf2d3beba02463b2e57a0f91d7699af0e6457fa0ef0aa238f76359d3531bf4831475978fdd8ab4eb943dccc295e294b2eb4d SHA512 589c6c5db0ad2b93d2b44284faa19845b48e790252ecf5983fb3ba2c2b749894a382eea6dffe053413c0b29b86063a8906b88ae6f165b1cc9fc79742ae2fc188
+EBUILD bluefish-2.2.12.ebuild 2375 BLAKE2B 4286418c0d2eaeae6c0e29f716106ffbb7a4278ce442acc7d901d6bcd48689ebe6ce8a94c246cf469645604b42ae8c71d22cd0b2fe4cd937c64ebcffdafb7d98 SHA512 ef0f87314fccc6edeff188d58d88128847f95b3e859c149106cf7179d16a32e13e6cf67421976601595fe6d02904f2324c217c1fbfa2627808e4aa93f20be4a0
+MISC metadata.xml 332 BLAKE2B a13f903b297465140112ca70818c0e4f42c4a1ea65f4bf2366cac8aa45634e6a1be5469d247811991b1a058feb0a170fd29e717d7267329522efdf9a8027678c SHA512 15c42425322a7fd4c8f6ccc253d36010d51d140fe005e3e0c2b6c1baa8d3b239758333eb337c4031efff501a89b5243c060d616af1f2b56a6f6e3ffe09c2d4e3
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
deleted file mode 100644
index 324637670ba0..000000000000
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="+gtk3 gucharmap nls spell"
-
-RDEPEND="
-	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
-	spell? ( >=app-text/enchant-1.4:0 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
-
-# eautoreconf seems to no longer kill translation files.
-src_prepare() {
-	default
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		--disable-python
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild
index 9b1dfeae212d..625cc993be5c 100644
--- a/app-editors/bluefish/bluefish-2.2.12.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild
@@ -1,31 +1,27 @@
-# 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..9} )
 
-inherit autotools python-single-r1 xdg
-
 MY_P=${P/_/-}
+inherit autotools python-single-r1 xdg
 
 DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
 HOMEPAGE="http://bluefish.openoffice.nl/"
 SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
+IUSE="gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
+	x11-libs/gtk+:3
+	gucharmap? ( gnome-extra/gucharmap:2.90 )
 	python? ( ${PYTHON_DEPS} )
 	spell? ( >=app-text/enchant-1.4:0 )"
 DEPEND="${RDEPEND}
@@ -44,17 +40,10 @@ S="${WORKDIR}/${MY_P}"
 RESTRICT="test"
 
 pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-
 	use python && python-single-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
 
 # eautoreconf seems to no longer kill translation files.
 src_prepare() {
@@ -68,8 +57,8 @@ src_configure() {
 		--disable-update-databases \
 		--disable-xml-catalog-update \
 		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
+		--without-gtk2 \
+		$(use_with gucharmap charmap) \
 		$(use_enable nls) \
 		$(use_enable spell spell-check) \
 		$(use_enable python)
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 52c7b2542143..56419257845e 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<use>
-	<flag name="gtk3">Enable GTK3 interface (default)</flag>
-	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
-	<flag name="spell">Enable spell checking capabilities via enchant library</flag>
-</use>
+		<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
+		<flag name="spell">Enable spell checking capabilities via enchant library</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 531640963db9..6bd6122b969a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,12 +11,11 @@ DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 50d4da099bb542a01f7a62d73ac33cf445fc6
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
 EBUILD emacs-23.4-r20.ebuild 11194 BLAKE2B 5a6ad012bc880a168592aaaa13ea478c40b33e3a4ab3e57e137be5e3ed6565263f406e75ee968c18b015524613ef8de9db1cbec990094c27220c22125d813297 SHA512 efbf5f07548f6e5faa5390322a06f05b40137994c0a85cadbdddc2f1359408fe16ec0a008734d0284119d78209e89894ac1904d3b27572b9878e747dc8d47be1
-EBUILD emacs-24.5-r9.ebuild 11064 BLAKE2B 230c4e7f4a42442abb9c5dd1b00e5d07c3c1809d00337b0772551f14978f8daa6b931d06b1a54a25880c9fdb94e1e331421d4980864cb7a327e43cc2338516fc SHA512 d31d44e5110c6bd0533697589ec8f0a54e254a55e0a9087bd11651184a4feedf067a7ea213f5c610836cf3e30c25ad8c56f8f72eb5d1256940aaa97ce9f9a366
-EBUILD emacs-25.3-r8.ebuild 11406 BLAKE2B 491e985bbef6ebb2b9fb59fb1c93934814439d6e01a7e1c96fe755f50974366afd86741b65743c36cd4f7cd5ba436768ff0ac6809a8ed4a53a9b8138df96b7e9 SHA512 6883b698c30ce51b5cc4aa65e001201567dc46182cc001ccbb6ae2fbec7d89689fa6a3c25ba9c93801dfb43073ceda4a83cfbe29261e3bfa620fd939b7669127
-EBUILD emacs-26.3-r3.ebuild 12224 BLAKE2B 0a6e7b4a2efa929000bebfd1a507d5862c5216b256719256bd5c63c4728d3b33204f7abf37108eb613fce89843ea283c51f8e07fb34dc671d6aa3cdfe3164256 SHA512 fb60f96f86d7b051cf0a8009365973e8275f14245e4b1bb1937f491b467c300405f3439c8c3c2eb5fefcc881f2b7fc726b090816711bec4094f8ea497c8bfec8
-EBUILD emacs-27.1-r2.ebuild 13769 BLAKE2B ea25627394cbdd0ba574631df460808dd13965846424a937f1cadcaa5345fea05b05820af6bbe4db5dd2478fed88d79002b60ce5a8a04de555a6e4b2e992e26d SHA512 1e73bf9d4ec1492654b007cf1211f0f2a9a5ee8fda0928fe18006b18c215f94d1c1e388a0607e8d1afb2608c6484b5978e444a7dfd6ff41537e93d698cebdad4
-EBUILD emacs-27.1-r3.ebuild 14748 BLAKE2B e179da1911c4b54cb5ed29d5e49a55b589d496a73bf01c2ab764d841d0f9297bbcdf6b153e4c658e188aaffff5cfd93b533fc39ebc9a87b9f447895709808904 SHA512 335ce4b318c0d2146f1189cf05cd3d80ef0dae775a5a82b66ede93ed035bd9a9251dcc95cbaa321b00f6f05633cb5dc1daffdf63745c34983985ec0e744af67b
-EBUILD emacs-27.1.91.ebuild 14710 BLAKE2B c369d96259b7f1699916a82e795132d9b5ee382241d45a6fe55d6f86333a073e83b6976ae0525eefb2f5d1fa045783a6340095197dbc59b613d6903465cc2582 SHA512 2c044cdd45c21f330e31ecf114b7f82b0cf9e6d5a8108456a3ee47acc081f9737245894b66134f3956c152a20e407314bac0b4453dd3dbf1761f77e0b9606da5
-EBUILD emacs-27.1.9999-r1.ebuild 14709 BLAKE2B be4d4e9455f17dccd45d6684bc7df95256d4420c95818f504117cef09abee3d59498e92aaed141bdbe2e4343758425ec3fc9ecaf3cc6e3397c9ca06eebfd540a SHA512 b9bb10eac9c6cb4df462fbaa9884e73fd73f1bf69324380f27738a5644090d4df8d82228acc6ff6a945b34ec6ebff3e3a5728fbd725b451c177d2ece5fb842b9
-EBUILD emacs-28.0.9999.ebuild 14680 BLAKE2B 41e448cffe10be975b6a3d6efd8442870c355cc167fc39da0d85fcadd482f8f2e09536cd80db555d5fac1c03521e182a8ef26e72de93b129ed83364314c4d8bc SHA512 6a102ceab1d4636a01add3d4f778ef99257d7cc366340f6e3a4db15ceb4eff0ef6df05d7eb1ca989896d8775ac39212c9bb55ea8e8eb560f0f232c2462dc0fe2
-MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51
+EBUILD emacs-24.5-r10.ebuild 10959 BLAKE2B 9abbd5cd629f2b577a9ad4635b6579f69c98945a0e920f821ec84a92fbc916c40ebb9bae88b49aa691fc3145d3a6d8c6224d876f7df055da85d7c2f3b74d1dfa SHA512 eebf1fe7c54f5a812ee97da236f9a19cc2ea4af60f9eb23b6a46ac0ada41d0795363a536d7b524c067c1ee4cb698eae9508a3493e17498804863bd2418b4e4ee
+EBUILD emacs-25.3-r9.ebuild 11301 BLAKE2B f0723b7c8efc6b6ce13648d365e544be55623eeb27f9a4f162da050ad17d6cd8164752f8b09caa96939b264b0c3e81c15aeebf360a4461b8a5e598829c8088f4 SHA512 f05e0a4ec7e585c5b750d8247f741d3f70a31efa8428e2af665ad751de8b2f6e01f621e517220fdcc86f9da2d614b76c5afb9eed60b22b5991ea48f1e740e1e1
+EBUILD emacs-26.3-r4.ebuild 11944 BLAKE2B 85880167c9e31ca96fbd8f3c1bc6966c5823d0a3381086a6457522de9b039d861c5b57cb2641c7b3a453a2f394ee2b207db8c9c53342fc644299eaedadb7467c SHA512 a3688ac6b7518fd2f0533fc40cbc388c5e1ced07b9677764456fd48fd6270cbaf954fcb43263407838d659d2daa06c4e881d02012cd16cd2a403125a2885d309
+EBUILD emacs-27.1-r4.ebuild 14468 BLAKE2B 290e754b87a3b237090c9d424bc68f2fab2a3b978bf6b320425599331b91cfc9e3279fffaae27f83d274cc55432722b98cb7ce53600090317a34e6494b9a94fa SHA512 3622fcc8e22f5b56441a1d3a2fa966b3c3fac7c85415c1f86af190c4e3705b8df74a783390e12e45f199b7262846a4b80793c25716f7e5588e53af378157833b
+EBUILD emacs-27.1.91-r1.ebuild 14433 BLAKE2B cb065e9683580acaca7fc3e33a4698490efa18d19d29a6176227c35f5378c3209b48d73bf7617175889fbbc02ea351416c9fd2c8215bf28109c41480ee940698 SHA512 acdc77b1c0fdfd6d11671fc2a78190ced36a9c637fbfed904c59784b330867436a44b527674b6bb02180c16713dc7849b340f715c85b50a0f117b51c298f1a34
+EBUILD emacs-27.1.9999-r1.ebuild 14432 BLAKE2B 418ae441461b589c1aac6875e7db6998815a24be9275b8cf40e383c2cb150c8da81e0062c1d10ff83d5763397cd1f694c75c4cde399e4d2a8754ad476d9645a0 SHA512 90edb4db36c1eb5f1bbbe2df0ff1b3dc7e2c2f3fbc0212f8ba8fc02224c2151407612cf564e23d940f9ed10eeb38eaa0d273d74a4b14e704537a865924c0f5b9
+EBUILD emacs-28.0.9999.ebuild 14015 BLAKE2B d764afba3091370f99f9c1ee3ea38c13757934dbfc0f005026de14ccc4408f05784504caab5647a815641215a698856df40224e7a0765fe951ad5781622068ac SHA512 76dc16d820c4f64d913f6a6a637c6e8d66345089a2272784031003f92fc8b55206d56940b78d3aae25a1f60f47b3eb87d2b09528f957493122a9e0e8ed51fb0e
+MISC metadata.xml 2892 BLAKE2B 4deeee5a7f1f8afb3d87e457d46ddbf4cd986939b81f782fbb7d11b76b12208229bdbc313ef004607ba0979e211ba289acf22f096548851f4607a9356ba61f51 SHA512 fca25f9574d686e91d2142a641eb3d736b5e9442f1edf849e0dd507fdc969218ff8bc2b1f1bcece027f82dcf1821dd7f04ed6d16372b7f04ab257f9dc2593764
diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
index 62c7cd0a20a5..e6ae1eab8caa 100644
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
 	app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -57,10 +57,7 @@ RDEPEND="acct-group/mail
 				>=dev-libs/m17n-lib-1.5.1
 			)
 		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? ( x11-libs/gtk+:3 )
-		)
+		gtk? ( x11-libs/gtk+:3 )
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
@@ -175,12 +172,13 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)"
+			myconf+=" --with-x-toolkit=gtk3"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
 					"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -199,8 +197,6 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		! use gtk && use gtk2 && ewarn \
-			"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
 	fi
 
 	econf \
diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
index e43700a2f211..4ddb30fb97ab 100644
--- a/app-editors/emacs/emacs-25.3-r8.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
 	app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -60,10 +60,7 @@ RDEPEND="acct-group/mail
 				>=dev-libs/m17n-lib-1.5.1
 			)
 		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? ( x11-libs/gtk+:3 )
-		)
+		gtk? ( x11-libs/gtk+:3 )
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
@@ -182,12 +179,13 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)"
+			myconf+=" --with-x-toolkit=gtk3"
 			myconf+=" --without-xwidgets"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
@@ -207,8 +205,6 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		! use gtk && use gtk2 && ewarn \
-			"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
 	fi
 
 	econf \
diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
index 60641dd7a88c..45b6320edc90 100644
--- a/app-editors/emacs/emacs-26.3-r3.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
@@ -62,13 +62,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 			)
 		)
 		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
 			)
 		)
 		!gtk? (
@@ -184,18 +181,13 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
 					"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -214,12 +206,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 	fi
 
 	econf \
diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild
deleted file mode 100644
index b78766488d2d..000000000000
--- a/app-editors/emacs/emacs-27.1-r2.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!<=app-editors/emacs-27.1.9999-r0:27-vcs
-	!app-editors/emacs-vcs:27
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-dumping=pdumper \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# 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
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
index a73497960d23..216c3c4521b9 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -33,14 +33,14 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 			)
 		)
 		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
 			)
 		)
 		!gtk? (
@@ -224,18 +221,13 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
 					"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -254,12 +246,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 	fi
 
 	if tc-is-cross-compiler; then
@@ -425,7 +413,7 @@ src_install() {
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
 		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
 	readme.gentoo_create_doc
 }
diff --git a/app-editors/emacs/emacs-27.1.91.ebuild b/app-editors/emacs/emacs-27.1.91-r1.ebuild
index 71b3f312c1de..50a0f78c3c66 100644
--- a/app-editors/emacs/emacs-27.1.91.ebuild
+++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 			)
 		)
 		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
 			)
 		)
 		!gtk? (
@@ -223,18 +220,13 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
 					"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -253,12 +245,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 	fi
 
 	if tc-is-cross-compiler; then
@@ -424,7 +412,7 @@ src_install() {
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
 		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
 	readme.gentoo_create_doc
 }
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index f4d96c1f74fc..4b787936fc98 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 			)
 		)
 		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
 			)
 		)
 		!gtk? (
@@ -223,18 +220,13 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
 				recommended that you compile Emacs with the Athena/Lucid or the
 				Motif toolkit instead.
 			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
 					"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -253,12 +245,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 	fi
 
 	if tc-is-cross-compiler; then
@@ -424,7 +412,7 @@ src_install() {
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
 		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
 	readme.gentoo_create_doc
 }
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 57cb4bc23cf8..af22d98f0305 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,34 +94,23 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 			)
 		)
 		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
 			)
 		)
 		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
+			Xaw3d? (
+				x11-libs/libXaw3d
 				x11-libs/libXmu
 				x11-libs/libXt
 			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
 		)
 	) )"
 
@@ -222,28 +211,16 @@ src_configure() {
 				Your version of GTK+ will have problems with closing open
 				displays. This is no problem if you just use one display, but
 				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
 				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
+				recommended that you compile Emacs with the Athena/Lucid
+				toolkit instead.
 			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
 			for f in Xaw3d athena; do
 				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
 			done
 		elif use athena || use Xaw3d; then
 			einfo "Configuring to build with Athena/Lucid toolkit"
@@ -252,12 +229,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 	fi
 
 	if tc-is-cross-compiler; then
@@ -423,7 +396,7 @@ src_install() {
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
 		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
 	readme.gentoo_create_doc
 }
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 1d93ee69f3e1..b3d9de5e45e7 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -31,8 +31,6 @@
     notification</flag>
   <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
   <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
   <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping
     engine</flag>
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index c61d531c02ce..c574fb1e7b98 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,5 +1,3 @@
-DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
 DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
-EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
 EBUILD gummi-0.8.1.ebuild 941 BLAKE2B cda4a2712cef8c8bcb7dbc532bda5520cdcaecc584adea637b09f254529c0b9d4d46fa2a11d165737ab573f0731c1e3ebd621f17073d642ba0c21af23136c49e SHA512 97240093be39eaa34879ed464538699a14b714775708fe60987cd58756f0acdd65cd87a0bf2a88c31bc70226626ef8e897b9e0ee566d00adcf90dac95d4940b8
 MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.6.6-r2.ebuild b/app-editors/gummi/gummi-0.6.6-r2.ebuild
deleted file mode 100644
index f67449975dee..000000000000
--- a/app-editors/gummi/gummi-0.6.6-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-DESCRIPTION="Simple LaTeX editor for GTK+ users"
-HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/gtkspell:2
-	app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	x11-libs/gtk+:2
-	x11-libs/gtksourceview:2.0
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Gummi supports spell-checking through gtkspell. Support for"
-	elog "additional languages can be added by installing myspell-**-"
-	elog "packages for your language of choice."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 8153c6e93ea1..06c25187a8cc 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73ce616e1c29ed22fbaed42cb78e7c9fbcd2424d98f86725fb00cee5160be4fe40abc97a927201557b684f800 SHA512 c6cda5544210bc3d3fa3cbb8494e60949e10ed3716d96b76d0c9e7f5671c7a85f6e7e7a860cfd05466f1bf52112053c722441ff338210c0ada89f10515ac170a
 DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
 EBUILD mg-20200215.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
-EBUILD mg-20200723.ebuild 1044 BLAKE2B bcdd18dfbdef4e09f9ced625ce21a8a391428942f74ab42c3a2f126449fb87da1e53c51643f06610ddc0250182d698c6b8ff4ea90763fa109475dd7c4240666d SHA512 e9ea391a0f88264c7d688c503f0972d00e4d489960b2c14b470d362dec6137f71ca7ac8fcca07f1610182524c28978fa1b4589c7d4bd8e46a3b9f4690495e180
+EBUILD mg-20200723.ebuild 1040 BLAKE2B b77be55b25a22e0714e18872cb2859ff233ee7842f40bdfca6e37ac4cd28fb0e0db2617864e475f743ae1bdf1d089f886ab954223e8e12fe4546441d3caa15eb SHA512 6eb9bf244bdb1d347219ac8455af4d916ca28745f3ddbca9d767ff8008aa34273b4d8f4b724dc72e1986a8756b70fecd72ff1f708cd9ad0c9eb8997410323cc1
 MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/mg-20200723.ebuild b/app-editors/mg/mg-20200723.ebuild
index 20816904f732..33b435751386 100644
--- a/app-editors/mg/mg-20200723.ebuild
+++ b/app-editors/mg/mg-20200723.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index e9fe82ecbccb..bf889d99e24b 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -2,8 +2,10 @@ DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031
 DIST mousepad-0.4.90.tar.bz2 808320 BLAKE2B 5a639001663d24a9d0ae126f672adb5d3a72825893e0f0d90e263596f214d76f973e0743248efee8562dc04afb09c0519ed649ca5d36b9221569490e289d687f SHA512 e839584782b09ee9d485ca4dcf05e22afb459cba269b3a15fe2dc0e3f3240bc15b1a8d7db92160b735d97d7293e67b0484b50ac3e72946b499dc65ac1097390b
 DIST mousepad-0.5.0.tar.bz2 810533 BLAKE2B c98fe38d65923fca2a5f2a769ad8fd0c92f77c6aff2c658e2ecd3bc3081988cb10b5dd49ba36020fe05c6f172e08f6efb825eb2c38b630dbcc6fd4d639313e15 SHA512 06cab143a3a0f98ad2aeecb0c7f034b8dede355de09632217da27dfb0675909c6cb284b227644c9ab3513a67fb23594ee63f0112ade69830d46559a8e7d65842
 DIST mousepad-0.5.1.tar.bz2 826973 BLAKE2B 6e0ae6570221b8e7ecfc5b7bf513eb7bf6efd745f977d46a1bc78d9ef4d59984964abc423f381d5170edc4a44f6672f1fa44f4bdc898260c43d0685c3603da30 SHA512 2b9403332f370bb75bf03a0e0aeab2b2f889fcd2fcef54e6d958e82933f5b6044dbf9416cf0ca5b43f4c304bb93dec185c647ebb40ed3915a87a15b76cf2e634
+DIST mousepad-0.5.2.tar.bz2 850592 BLAKE2B a30185f7a9c276eb5744db4664cdc9ad41520ec12018118f5ddfc2d39a5a5d6545d90222660d585c5b570c9e5a32c921edf2d727adcfad6addacdaa412d094e4 SHA512 03302b95f411240d19631b48fe462e47b7d6fa9cc0df07b9de2e56f1f402a9058ab423353ab8b3530ad14889e62299c7a1bed020349cca059d13566c6b8db8b8
 EBUILD mousepad-0.4.2.ebuild 1147 BLAKE2B 05c61f59b02d3fa600143f96e3135e4f0d4e3b7b2bb22e83005120c095477018dac9fac4d6895a7e01ff06a24edcf40862236ba3202898637446239b8e79c5e1 SHA512 91532dc7048428097cfccfa7b0444ef39a00cdd859842ec01d20029bd5fcab4e8baf3eea0993b0a7f29acb8fd00c40f7c57a9db7d69ba619c0c41a28f10b83fb
 EBUILD mousepad-0.4.90.ebuild 794 BLAKE2B b605fdbc5f0162763ea0944a55550221eeaa53c5886db3ff7528bba3e6314c37db6dd0e3c28ece1bebc19cb825bdcc559dcec8007e4043d93066a8ba0d3a11e9 SHA512 e48fad969fb5742577a300bba23fd9b3bb6651e8b722d819faeb2fd185e9e1b87807ce137dff26c97752db86ef2c7a68fa41a17abd9a7490a65bbc6b97c4c6ee
 EBUILD mousepad-0.5.0.ebuild 794 BLAKE2B b605fdbc5f0162763ea0944a55550221eeaa53c5886db3ff7528bba3e6314c37db6dd0e3c28ece1bebc19cb825bdcc559dcec8007e4043d93066a8ba0d3a11e9 SHA512 e48fad969fb5742577a300bba23fd9b3bb6651e8b722d819faeb2fd185e9e1b87807ce137dff26c97752db86ef2c7a68fa41a17abd9a7490a65bbc6b97c4c6ee
 EBUILD mousepad-0.5.1.ebuild 805 BLAKE2B cde75bb7e88a035666a424fa564a25b9a86603cfae0f01e3386a059edc79c8bf8a443b6f72cece43179c3e2e392bf879614bba0616212e5ef2c407c8aa40bd76 SHA512 4d435c9f3bb029379089d10f557c3de198b8731faab94abcdf6f8bf4ebf959df59498a279441c5599b9fd62e42d6d789fb2a01e47690af10baf8a16604ccb1ce
+EBUILD mousepad-0.5.2.ebuild 805 BLAKE2B ea302e5b264c71fd86aba7b465ce08b48ac054ad5c7b0699939d6a8e9f4549526b828f5d2e83fdd41052139dfb0a9908072b709024e88485051a708710c4c73d SHA512 6026a8a1511888d2c83ee9cee907dbf8f16271d4e5b0d86eeca9a450787ddd270366a6857e0280d11a514f1df550c992619f11773d048805ea3cb3dddefaff0e
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.5.2.ebuild b/app-editors/mousepad/mousepad-0.5.2.ebuild
new file mode 100644
index 000000000000..727e1bf86564
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.52
+	>=xfce-base/xfconf-4.12:=
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-3.24:3.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 888f79ed9bba..30aaf04d0873 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,4 +1,3 @@
-AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4
 AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a
 AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
diff --git a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch
deleted file mode 100644
index 5826d62ce6c1..000000000000
--- a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-From ebcde1de42588e697e0f4eaed9f6f0ea6a77a2cd Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 16:33:55 +0100
-Subject: [PATCH 1/6] nvim:eval: Fix enum declaration for ListLenSpecials
-
-Instead of declaring an enum, this creates a global variable. As gcc10
-uses -fno-common by default, global variables declared with the same
-name more than once is not allowed anymore revealing this issue.
-
-Each time this header is included, we define the enum name as a global
-variable.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/eval/typval.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
-index 008453b87f2f..5afdedff751b 100644
---- a/src/nvim/eval/typval.h
-+++ b/src/nvim/eval/typval.h
-@@ -33,7 +33,7 @@ typedef double float_T;
- enum { DO_NOT_FREE_CNT = (INT_MAX / 2) };
- 
- /// Additional values for tv_list_alloc() len argument
--enum {
-+enum ListLenSpecials {
-   /// List length is not known in advance
-   ///
-   /// To be used when there is neither a way to know how many elements will be
-@@ -49,7 +49,7 @@ enum {
-   ///
-   /// To be used when it looks impractical to determine list length.
-   kListLenMayKnow = -3,
--} ListLenSpecials;
-+};
- 
- /// Maximal possible value of varnumber_T variable
- #define VARNUMBER_MAX INT64_MAX
-
-From b87b4a61476bb65e9200bd2ee93b8a98ca4db84e Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 17:17:37 +0100
-Subject: [PATCH 2/6] nvim:viml: Fix enum declaration of ExprParserFlags
-
-Instead of declaring an enum, this creates a global variable. As gcc10
-uses -fno-common by default, global variables declared with the same
-name more than once is not allowed anymore revealing this issue.
-
-Each time this header is included, we define the enum name as a global
-variable.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/viml/parser/expressions.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h
-index 23e172da75b2..838a74227182 100644
---- a/src/nvim/viml/parser/expressions.h
-+++ b/src/nvim/viml/parser/expressions.h
-@@ -326,7 +326,7 @@ struct expr_ast_node {
-   } data;
- };
- 
--enum {
-+enum ExprParserFlags {
-   /// Allow multiple expressions in a row: e.g. for :echo
-   ///
-   /// Parser will still parse only one of them though.
-@@ -345,7 +345,7 @@ enum {
-   //     viml_expressions_parser.c, nvim_parse_expression() flags parsing
-   //     alongside with its documentation and flag sets in check_parsing()
-   //     function in expressions parser functional and unit tests.
--} ExprParserFlags;
-+};
- 
- /// AST error definition
- typedef struct {
-
-From 986db1adb491b5cb5936d2369816236847af26da Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 16:36:21 +0100
-Subject: [PATCH 3/6] nvim: Fix enum declaration of RemapValues
-
-Instead of declaring an enum, this creates a global variable. As gcc10
-uses -fno-common by default, global variables declared with the same
-name more than once is not allowed anymore revealing this issue.
-
-Each time this header is included, we define the enum name as a global
-variable.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/getchar.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h
-index 01f60ccf4945..f0b52079aad1 100644
---- a/src/nvim/getchar.h
-+++ b/src/nvim/getchar.h
-@@ -10,12 +10,12 @@
- /// Values for "noremap" argument of ins_typebuf()
- ///
- /// Also used for map->m_noremap and menu->noremap[].
--enum {
-+enum RemapValues {
-   REMAP_YES = 0,  ///< Allow remapping.
-   REMAP_NONE = -1,  ///< No remapping.
-   REMAP_SCRIPT = -2,  ///< Remap script-local mappings only.
-   REMAP_SKIP = -3,  ///< No remapping for first char.
--} RemapValues;
-+};
- 
- // Argument for flush_buffers().
- typedef enum {
-
-From 517bf15603aba37014b62553eb008e26f2a1db48 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 16:40:37 +0100
-Subject: [PATCH 4/6] nvim:msgpack: Correctly set up global
- ch_before_blocking_events
-
-gcc10 builds with -fno-common by default. This mean you can't define
-a global variable with the same name twice.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/msgpack_rpc/channel.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nvim/msgpack_rpc/channel.h b/src/nvim/msgpack_rpc/channel.h
-index 9ff5abdc5f55..90e1c7d48b4c 100644
---- a/src/nvim/msgpack_rpc/channel.h
-+++ b/src/nvim/msgpack_rpc/channel.h
-@@ -15,7 +15,7 @@
- /// HACK: os/input.c drains this queue immediately before blocking for input.
- ///       Events on this queue are async-safe, but they need the resolved state
- ///       of os_inchar(), so they are processed "just-in-time".
--MultiQueue *ch_before_blocking_events;
-+EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL);
- 
- 
- #ifdef INCLUDE_GENERATED_DECLARATIONS
-
-From 823b2104c3e579e8c3db8baab263dca0aa9d48bc Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 17:29:12 +0100
-Subject: [PATCH 5/6] nvim: Correctly setup global channels
-
-As gcc10 uses -fno-common by default, global variables declared with the
-same name more than once is not allowed anymore revealing this issue.
-
-We need to define it as extern to access it.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
----
- src/nvim/channel.c | 1 -
- src/nvim/channel.h | 2 +-
- src/nvim/main.c    | 1 +
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvim/channel.c b/src/nvim/channel.c
-index c66a0682e351..5eb29a7290c2 100644
---- a/src/nvim/channel.c
-+++ b/src/nvim/channel.c
-@@ -19,7 +19,6 @@
- #include "nvim/ascii.h"
- 
- static bool did_stdio = false;
--PMap(uint64_t) *channels = NULL;
- 
- /// next free id for a job or rpc channel
- /// 1 is reserved for stdio channel
-diff --git a/src/nvim/channel.h b/src/nvim/channel.h
-index c733e276bef2..9d26852ce532 100644
---- a/src/nvim/channel.h
-+++ b/src/nvim/channel.h
-@@ -85,7 +85,7 @@ struct Channel {
-   bool callback_scheduled;
- };
- 
--EXTERN PMap(uint64_t) *channels;
-+EXTERN PMap(uint64_t) *channels INIT(= NULL);
- 
- #ifdef INCLUDE_GENERATED_DECLARATIONS
- # include "channel.h.generated.h"
-diff --git a/src/nvim/main.c b/src/nvim/main.c
-index 56d9030a7f42..4a9f2371a298 100644
---- a/src/nvim/main.c
-+++ b/src/nvim/main.c
-@@ -10,6 +10,7 @@
- #include <msgpack.h>
- 
- #include "nvim/ascii.h"
-+#include "nvim/channel.h"
- #include "nvim/vim.h"
- #include "nvim/main.h"
- #include "nvim/aucmd.h"
-
-From 0504f2f88dac9a4cf1fe1052a1e00ab203e9cf8e Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 17 Feb 2020 18:04:01 +0100
-Subject: [PATCH 6/6] cmake: Check for -fno-common and use it if available
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de530bb4f7da..74e161d98907 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -308,6 +308,11 @@ if(UNIX)
-   endif()
- endif()
- 
-+check_c_compiler_flag(-fno-common HAVE_FNO_COMMON)
-+if (HAVE_FNO_COMMON)
-+  add_compile_options(-fno-common)
-+endif()
-+
- check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)
- if(HAS_DIAG_COLOR_FLAG)
-   if(CMAKE_GENERATOR MATCHES "Ninja")
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index b9ef59106cb1..6d227614828d 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..fbd056737062
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/en/okteta
+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"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 1f1d8e4b1cd5..42d9aa2d3c5f 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348a
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.7.ebuild 1973 BLAKE2B de9a8704f0de91e7ccb53206c39fd99348f72afeb6a694442baaed20696e2820302806ec90ff55acc9753272e0a84f74492aeff17d1280c156aa662bb3542ad9 SHA512 bcc4496f6a6ee2161b2f245bc72425e292453cc49b1e7cd246520495f8dd986bb35376fa80e0add0fe75fcf806f0eb49e0b54a2573dc0841726280a1194923e4
-EBUILD vis-9999.ebuild 1398 BLAKE2B 0697e80ce72ffbffedba444987fd63a009d7fed1974ac57ed85d5226998987dbaecd0d0d99d4050d807960c063238cf8aae627805bc2cf642f678949d79eb2df SHA512 9528fefb1cc797475443ffd08fb531a83179841b3bc91bcf375d6da216e62ef0e29ffce41185835313d733856f33ab13126e344365c51a369df14e66f35df27d
+EBUILD vis-0.7.ebuild 2085 BLAKE2B 1f924e149cbdaff3610bbe703060f4c63fac6221ee2a554588c5ca7eaf25be57be5ecff89d42d0b0263127b0ea0bae68a6bd64037f459b8716441bfae4f76354 SHA512 3642b00f52bd4c86a87b1426f13b5dd5abab6a5a39a41d54d6dad78a31cd907d35b75a75501e26b485427e6d2b450a534a69570eac7af9a7121a84c5f4504a92
+EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.7.ebuild
index 4d2ac5754f60..c9d0b3047ab2 100644
--- a/app-editors/vis/vis-0.7.ebuild
+++ b/app-editors/vis/vis-0.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PTV=0.5
-LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
+LUA_COMPAT=( lua5-2 lua5-3 )
 
 inherit lua-single optfeature
 
@@ -26,6 +26,8 @@ DEPEND="dev-libs/libtermkey
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
+# https://github.com/martanne/vis-test/issues/28
+BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') )"
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index bb8d1be8d88a..9f919a60fc33 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.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
-LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
+LUA_COMPAT=( lua5-2 lua5-3 )
 
 inherit lua-single git-r3 optfeature
 
@@ -23,6 +23,8 @@ DEPEND="dev-libs/libtermkey
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
+# https://github.com/martanne/vis-test/issues/28
+BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') )"
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index f6dec096b383..11be708d2016 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -5,5 +5,5 @@ DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a6
 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
 EBUILD zile-2.3.24-r2.ebuild 1368 BLAKE2B 308ea08faf165d84b31d2930ecc0fa61bbb087dd009acdc0941743d2738bbd94633672f067854a40d1a207db58af3ca0aca8e704675543bb5185ff7548c47405 SHA512 f721e9f61105809c3eb463f9f0d6e42d3151f32ca98d8e5b26ef46151186bb513036b8be5cda37b3deea48b9713e4b8d9652c5564ef17b5acdefab813a753960
 EBUILD zile-2.4.14.ebuild 1372 BLAKE2B 66fcb554a699b077a46493e517184ab2737e7b7b71e33a0cbb10bcff258f20a9ebf5eb428570e475d8ef818a575171790818b4ee6c264a0c7d0b69c706127015 SHA512 0b556569e60c4f102c41610787ee429e05669731d28ff334ad1d0a075beb25d61efad62c82f7a92919d83f117258fbf684f80b5ce12aa7097e10f1b2e4d04a7a
-EBUILD zile-2.4.15.ebuild 1099 BLAKE2B 458fc420804ca59606b3f7c5bd9fc4e71ce53c89518b61890e861c744066bf8e73ea13a03ac2343f892ef1d43c8f525e4e7def6948e1a7de8efd141a705064ce SHA512 261f0a2de7f3eb2687b9ca7c0f37aedfd195c9ea61a1db5cd2d2530eccf5f37cf66dd7a08c7b8226958ab8d67b2356e9b7ae77e60ebd8c4a3dbe2e43968b5ca3
+EBUILD zile-2.4.15.ebuild 1095 BLAKE2B 7f4ca66da5895211caefd7770b424bc95ea5d43b7e63ec3248d7a3aae8b4526d2655b8f6bd9e412361b554cd494bd58dd23cabefb914d694622a411035bdafb9 SHA512 125fadde6f1a18e05c99a916d0e211b9f269431e80bb9cf3653f562cdf5146a89b5e4b9f1a4f14855a8fc1f5de342e34a065a9ed654c6c019885b4ffe25791bf
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.4.15.ebuild b/app-editors/zile/zile-2.4.15.ebuild
index 07c97a015ba0..24ee6b12100d 100644
--- a/app-editors/zile/zile-2.4.15.ebuild
+++ b/app-editors/zile/zile-2.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="acl"
 
 RDEPEND=">=dev-libs/boehm-gc-7.2:=
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /app-editors
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)