9 files changed, 107 insertions, 14 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 977eac928102..82362e9ae836 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 3e05f6c3b584..c68d7923601c 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-42.1.tar.xz 6916780 BLAKE2B a4350a62811ee689f9a7f70a4b166aa82185a17ab6c6f0f6264404756a2e7f2b93e81b2cf88beaf4141527720437f9e6ee9f7584e65e63fe242975e346d26586 SHA512 b7b1dd4ab31412a2bdeb6298065d1e3f52a9c813e26e943aea606b30e3de9b7690cc8ba478e2d0e49fb51bed57dd3f7c441184964270629d51dc1f6d132045a6
+DIST gedit-42.2.tar.xz 6917596 BLAKE2B fd7b0a1c113e944b1b3f0c2bb55a061e76e7ee71ebbfe8d64c6d5b0c7e47b8dd54519bde1b7b095a1cab27a169427eecdf35d06422c1a984f51dab82e19c7cb0 SHA512 d50f021f33764e0cdd3ac51650db0e37dacb5b6edeadddfd8136e8120e83eb740db66ada25ae43eac810896714859d6f8876640a8976ddfd6e7e602c278dcc99
 EBUILD gedit-42.1.ebuild 1936 BLAKE2B 2243db57b62139ae971131dceec859f92e57b9ecd0696b0a09e9f876bb9b50b422fff457df10ad185d5a35b725c9bb4a008b7a1ed66493993823f826bfe8b466 SHA512 cececad6039ed43345f2afa251fe02050e6d7fc5c14133429235484ffc48681b964ff2926130ea25aeaec821c5583921fd59e6825c952c0cbaac5efde02c0701
+EBUILD gedit-42.2.ebuild 1885 BLAKE2B 269b30274b3abe99c005e2019f8bcb79a6e17592f95ac135fa0221a413d1a453f920cf42469e4497e237f1f37591294b4108dd76eb78002ba8a3e08d058f2d41 SHA512 f1f0cbe679b74220d58e33539f500d589f66553b5d4690aca5b7f2748b7096a41c3b3169f1c68073ae9828acfd45d3b9801d79f25e8d6ac6240c028e95256337
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/gedit-42.2.ebuild b/app-editors/gedit/gedit-42.2.ebuild
new file mode 100644
index 000000000000..250e1be179a4
--- /dev/null
+++ b/app-editors/gedit/gedit-42.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.64:2
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/gobject-introspection-1.54:=
+
+	spell? ( >=app-text/gspell-0.2.5:0= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+"
+BDEPEND="
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use python)
+		$(meson_feature spell)
+		-Duser_documentation=true
+		-Denable-gvfs-metadata=yes
+
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python; then
+		python_optimize
+		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 2e95af750599..9cc4940b2027 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,5 +1,5 @@
 AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a
-AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c
+AUX vimrc-r6 7488 BLAKE2B 959724b9fbb54755553ae6448bf7ff9991288a2473af122ec769157060465559c7fef6481f1e773936df1d3b7c2344376bb8ea405542b7b17b2deb8d03544623 SHA512 60dcb1d954103d3fc9943c884b9891627adf70801d819dc65972887d516720b5a2db0db234ba891cca7269e0b117b73f34ab6dee851bc057b9abf518b52e967e
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
@@ -7,8 +7,8 @@ DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
-EBUILD vim-core-8.2.4586.ebuild 7060 BLAKE2B 3833f51bdbe7eb68035a36797ad39aac82377ee8ad578aeccf2444e6f199055850f38c1ccb79bfba1afc28927df10784a3f4a5f2916d135266ec3351828b69f8 SHA512 2b4ecaebbca12e1c53cbb0659a12911db64666a04ceb38de6c2ae769ac36536eafeda2451134defd634c06971673d587cccca7f52dc7fb89848dfae0152aff27
-EBUILD vim-core-8.2.5066-r2.ebuild 7002 BLAKE2B 18d0d3115af5efb7392c9a0b44311d5d96a15ba8c811e4ccb3109d3e2a0fd42ca6fe82b73d099cff0ccdf9b132ee6ea52c08ca95c79c133e99a0b4c347d2ddc4 SHA512 66fca357c4dc61d443baa0b49100aa3104bf55137d37d4bb57aafd2cf19e01ee43f6058e36adb393df2fd39ca3ad7a2179f05d8608fb9ef34a564a36cf7c308a
-EBUILD vim-core-9.0.0049-r1.ebuild 6925 BLAKE2B b447b47be2018f52609880b7bb06597f5c940fd7441e105d9af396e778ee8c2ee6645ca97980af50f76dbcea7b840de61632f561945a2043ba4fa1247f88fdf0 SHA512 cc52a48f196b3703ce7cf92adb9131983697a1cae48b5bee2d42147717d9f3423975cdabd462452191baa9205b5ac9491aaba73ba771167dd86ce616ae2cd87e
-EBUILD vim-core-9999.ebuild 6925 BLAKE2B b447b47be2018f52609880b7bb06597f5c940fd7441e105d9af396e778ee8c2ee6645ca97980af50f76dbcea7b840de61632f561945a2043ba4fa1247f88fdf0 SHA512 cc52a48f196b3703ce7cf92adb9131983697a1cae48b5bee2d42147717d9f3423975cdabd462452191baa9205b5ac9491aaba73ba771167dd86ce616ae2cd87e
+EBUILD vim-core-8.2.4586-r1.ebuild 6932 BLAKE2B c68dabf5622f757054b43501f5f01610a237736fb29d26c65f79e2e2edbb45e08651114c2f1563ac91e80d26edded1d33e139dfb9b31dca5a5550d8b14bb391b SHA512 ec8ec83e16c023db06a0f8e33e4cda656c10da8c475fc316f175c18dc26d70066e74e1e9dc9ed7ca68112ee6e82c7c3acdccbe50e7287cbcf23aa1ad1c410d67
+EBUILD vim-core-8.2.5066-r3.ebuild 7002 BLAKE2B 853cfa96f312cbabb2513f4dece34987af22d6ddcea6a41f47aa5ee37798dfd6c00dc97d26dc5729ee546dff2b287081ee885cfa6aa556f6c20962dfb4196210 SHA512 f21c04836f1664602c529c84507d24776b833baff0c224abf237b7a1505424a2ebf2d23dcd7cf56a4534204df85dd058271f0c2d0e89d6f3be0e83cb1c3a5b52
+EBUILD vim-core-9.0.0049-r2.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
+EBUILD vim-core-9999.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r6
index 2409822e628c..0197f057d233 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r6
@@ -190,8 +190,11 @@ endif " has("autocmd")
 " }}}
 
 " We don't want VIM to load their own built-in defaults, preferring ours here
-" instead:
-let g:skip_defaults_vim = 1
+" instead. This option cannot apply to minimal builds, so it is guarded by a
+" test that's guaranteed to fail for those, owing to the lack of +eval.
+if 1
+  let g:skip_defaults_vim = 1
+endif
 
 " Enable Omni completion when opening a file only if a specific plugin does
 " not already exist for that filetype. This allows Omni completion
diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
index ab6f035d555a..9082086dac7b 100644
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
@@ -182,7 +182,7 @@ src_install() {
 	# default vimrc is installed by vim-core since it applies to
 	# both vim and gvim
 	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
+	newins "${FILESDIR}"/vimrc-r6 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 
 	if use minimal; then
@@ -203,9 +203,6 @@ src_install() {
 				printf '%s\0' "${f}"
 			fi
 		done | xargs -0 rm -f || die
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
index c11d467f2a5a..80f292882ea4 100644
--- a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
@@ -183,7 +183,7 @@ src_install() {
 	# default vimrc is installed by vim-core since it applies to
 	# both vim and gvim
 	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
+	newins "${FILESDIR}"/vimrc-r6 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 
 	if use minimal; then
diff --git a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
index 555b9e91b8db..17a02fa52a3c 100644
--- a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
@@ -179,7 +179,7 @@ src_install() {
 	# default vimrc is installed by vim-core since it applies to
 	# both vim and gvim
 	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
+	newins "${FILESDIR}"/vimrc-r6 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 
 	if use minimal; then
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 555b9e91b8db..17a02fa52a3c 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -179,7 +179,7 @@ src_install() {
 	# default vimrc is installed by vim-core since it applies to
 	# both vim and gvim
 	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
+	newins "${FILESDIR}"/vimrc-r6 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 
 	if use minimal; then