gentoo resync : 28.04.2021

7 files changed, 43 insertions, 261 deletions

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 37ef978a7893..16640e3dde94 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,13 +1,10 @@
-AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
-AUX 3.36-make-gspell-optional.patch 2126 BLAKE2B b4e56744d3ece3e380c1aa628c02237ec8b36fa1c2b9efeee30391cbe9e3d5016e540862b25404ec4f807d9dfb3b78c2a6dc5f5ead2a71dbf4889d78af4cc2b1 SHA512 5916685a00ffa2f1b6f0b0ae77f5165a0199a40eb87e32d00a534d5049454df8aba9c1ba507fb5c1b8c4009c1c1689b962d2051a70173fd335007d5872eeaad0
-AUX 3.36-make-python-optional.patch 2509 BLAKE2B d88b0bf53e37cf20520b5d22565e3ecdfadb112751345784c962747602fd086cf238196ef33c340e228d0aa799631645d5b250bbaa650acfcb387000409405cf SHA512 bc87270a19d8f067ba5d7e697468526a931e020959b04bb1c824dcdf8ca5fe5799cfbf53b1b6e70862a7badbc7a0be98b34cbae1e3cabf90cbfccfd7d6c81b83
 AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
-DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
-DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
 DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
-EBUILD gedit-3.34.1.ebuild 2194 BLAKE2B a3eb2e4dc8094b9baf9670f84844bb086194abd73807ec7b9ae992cdb3ca7af7e50a0bf1b83e0eeeb7126b3d8997fd774d7e397c2ce8c61ddc1a8eccede06e89 SHA512 5aefc4ff696dc55405cf09dd016288a610b8b0a9c3c9d7f7ace294ee46d240c96d8a41dfdf20a776e459d67874c522b105d2bae336bea61b079812e7eb8880eb
-EBUILD gedit-3.36.2.ebuild 2413 BLAKE2B f6764f88362bb49f8a9d709859e1e42efd59cf2b9fbf6762b4847f5284aeffea1aadd3ef88aa14027f1574d43aac26f34012ab7e3a358e30816ac3a800eb25ca SHA512 8181de32899df3de423711b85501ed361d4f7c43ad4c4d62545d50535b52c9cf1283997f030b6378fc6f37e6b8e0106b79f59c63712b6378f2eab0d7aaf35bb8
-EBUILD gedit-3.38.1.ebuild 2271 BLAKE2B e736e05be9452b79440652dbc46c4f9de4d74081f4fc9dcf04c147addbb61d6e44b21f3e9ade405c971cb82763147505d86cba85dd505da5b332d6a1634e61f8 SHA512 166c55db5fad6636cac88e60e911b52e27d875a6c0079fbb2f20bc4e0fd3b9feeed9f653e0d3b7cea645e4fb17b5b89f31742c458d703584fa9563f1893f19d4
+DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e
+DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
+EBUILD gedit-3.38.1.ebuild 2270 BLAKE2B 69d117a04236aa8643c992c683412290991609ebf9131035fdbb2c2c84a8e4157d868e47243794cebe91513051638fe04b76c741de8acbfbfe9196c7ce379a8e SHA512 5fa553b145169481336968982b42cc3b51ca703aef3de7e833ff8f31d9255ed049d8975ba888a4b3ee21fd72114d3309a230436b89206fb32a270b06c0c18d18
+EBUILD gedit-40.0.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
+EBUILD gedit-40.1.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
deleted file mode 100644
index 1d772590f605..000000000000
--- a/app-editors/gedit/files/3.32.2-make-spell-optional.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhan@gentoo.org>
-Date: Sun, 26 May 2019 14:19:17 -0400
-Subject: [PATCH] make spell optional
-
----
- meson.build         | 4 +++-
- meson_options.txt   | 4 ++++
- plugins/meson.build | 4 +++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2f4d7e5..f67e320 100644
---- a/meson.build
-+++ b/meson.build
-@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req)
- libgd_dep = libgd_sp.get_variable('libgd_dep')
- 
- libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true)
--gspell_dep = dependency('gspell-1', version: gspell_req, required: true)
-+with_gspell = get_option('spell')
-+gspell_dep = dependency('gspell-1', version: gspell_req, required: false)
- x11_dep = dependency('x11', required: false)
- 
- introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false)
-@@ -189,6 +190,7 @@ summary = [
-   '  Introspection: @0@'.format(generate_gir),
-   '        Plugins: @0@'.format(build_plugins),
-   '       Vala API: @0@'.format(generate_vapi),
-+  '          Spell: @0@'.format(with_gspell),
-   '  Gvfs metadata: @0@'.format(enable_gvfs_metadata),
-   '',
-   'Directories:',
-diff --git a/meson_options.txt b/meson_options.txt
-index 90803fa..e1f7349 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,3 +16,7 @@ option('documentation',
- option('enable-gvfs-metadata',
-         type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
-         description: 'Enable using gvfs to store metadata')
-+
-+option('spell',
-+	type:'boolean', value: true,
-+	description: 'Build spell support')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index af94ab7..abeeac5 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -21,5 +21,7 @@ subdir('quickhighlight')
- subdir('quickopen')
- subdir('snippets')
- subdir('sort')
--subdir('spell')
-+if with_gspell
-+  subdir('spell')
-+endif
- subdir('time')
--- 
-2.21.0
-
diff --git a/app-editors/gedit/files/3.36-make-gspell-optional.patch b/app-editors/gedit/files/3.36-make-gspell-optional.patch
deleted file mode 100644
index e891f98f0c00..000000000000
--- a/app-editors/gedit/files/3.36-make-gspell-optional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d622460b08c7c13ce8e0c23e3afcbd1e4c65d019 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:20:31 +0300
-Subject: [PATCH] build: Make gspell optional
-
----
- meson.build               | 3 ++-
- meson_options.txt         | 4 ++++
- plugins/spell/meson.build | 4 ++++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index edb2896a6..b8707f33d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -63,7 +63,7 @@ libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_req)
- 
- libgd_dep = libgd_subproject.get_variable('libgd_dep')
- 
--gspell_dep = dependency('gspell-1', version: '>= 1.0', required: true)
-+gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
- x11_dep = dependency('x11', required: false)
- 
- introspection_dep = dependency('gobject-introspection-1.0', required: false)
-@@ -154,6 +154,7 @@ summary = [
-   '        User documentation:    @0@'.format(get_option('user_documentation')),
-   '        GObject Introspection: @0@'.format(generate_gir),
-   '        Vala API:              @0@'.format(generate_vapi),
-+  '        Spell checker plugin:  @0@'.format(gspell_dep.found().to_string()),
-   '',
- ]
- message('\n'.join(summary))
-diff --git a/meson_options.txt b/meson_options.txt
-index d0cbf0720..03e07244e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,10 @@ option('gtk_doc',
-        type: 'boolean', value: false,
-        description: 'Build API reference for plugins (requires gtk-doc)')
- 
-+option('spell',
-+       type: 'feature', value: 'enabled',
-+       description: 'Build spell checking plugin')
-+
- # This option exists for the developers, to speed up the install.
- option('user_documentation',
-        type: 'boolean', value: true,
-diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
-index 8ce7634b7..cccb42fc1 100644
---- a/plugins/spell/meson.build
-+++ b/plugins/spell/meson.build
-@@ -1,3 +1,7 @@
-+if not gspell_dep.found()
-+  subdir_done()
-+endif
-+
- libspell_sources = files(
-   'gedit-spell-app-activatable.c',
-   'gedit-spell-plugin.c',
--- 
-2.20.1
-
diff --git a/app-editors/gedit/files/3.36-make-python-optional.patch b/app-editors/gedit/files/3.36-make-python-optional.patch
deleted file mode 100644
index c27a0551f00b..000000000000
--- a/app-editors/gedit/files/3.36-make-python-optional.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d082ef03b9f545980ab77e6c0a20d5bf4893be69 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:34:42 +0300
-Subject: [PATCH] build: Make python optional
-
----
- gedit/meson.build   |  2 ++
- meson.build         |  4 +++-
- meson_options.txt   |  4 ++++
- plugins/meson.build | 11 +++++++----
- 4 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/gedit/meson.build b/gedit/meson.build
-index 075c001b2..174deba04 100644
---- a/gedit/meson.build
-+++ b/gedit/meson.build
-@@ -214,6 +214,7 @@ if generate_gir == true
-     install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
-   )
- 
-+if get_option('python')
-   python3.install_sources(
-     'Gedit.py',
-     subdir: join_paths(
-@@ -221,6 +222,7 @@ if generate_gir == true
-       'overrides',
-     )
-   )
-+endif
- 
-   libgedit_dep_sources += [
-     libgedit_gir,
-diff --git a/meson.build b/meson.build
-index b8707f33d..4e40833ec 100644
---- a/meson.build
-+++ b/meson.build
-@@ -69,7 +69,9 @@ x11_dep = dependency('x11', required: false)
- introspection_dep = dependency('gobject-introspection-1.0', required: false)
- vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
- 
--python3 = python.find_installation('python3')
-+if get_option('python')
-+  python3 = python.find_installation('python3')
-+endif
- 
- build_checkupdate_plugin = host_machine.system() == 'windows'
- if build_checkupdate_plugin
-diff --git a/meson_options.txt b/meson_options.txt
-index 03e07244e..cdcec6165 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,10 @@ option('gtk_doc',
-        type: 'boolean', value: false,
-        description: 'Build API reference for plugins (requires gtk-doc)')
- 
-+option('python',
-+       type: 'boolean', value: true,
-+       description: 'Install GIR python overrides and python plugins')
-+
- option('spell',
-        type: 'feature', value: 'enabled',
-        description: 'Build spell checking plugin')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index a9167f8d6..97f1b1765 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -20,13 +20,16 @@ if build_checkupdate_plugin
- endif
- 
- subdir('docinfo')
--subdir('externaltools')
- subdir('filebrowser')
- subdir('modelines')
--subdir('pythonconsole')
- subdir('quickhighlight')
--subdir('quickopen')
--subdir('snippets')
- subdir('sort')
- subdir('spell')
- subdir('time')
-+
-+if get_option('python')
-+  subdir('externaltools')
-+  subdir('pythonconsole')
-+  subdir('quickopen')
-+  subdir('snippets')
-+endif
--- 
-2.20.1
-
diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild
index b3c466392a1e..570c7cf25780 100644
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ b/app-editors/gedit/gedit-3.38.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-40.0.ebuild
index b767ef9772d0..8a7d0429c49e 100644
--- a/app-editors/gedit/gedit-3.36.2.ebuild
+++ b/app-editors/gedit/gedit-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,21 +14,20 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.52:2
+	>=dev-libs/glib-2.64:2
 	>=dev-libs/libpeas-1.14.1[gtk]
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
-	>=gui-libs/tepl-4.4:4
-	x11-libs/libX11
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+	gui-libs/tepl:6
 
 	spell? ( >=app-text/gspell-0.2.5:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -44,7 +43,7 @@ RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
@@ -57,8 +56,8 @@ PATCHES=(
 	# disagree with; those wanting them off in general would set that globally for gtk
 	"${FILESDIR}"/restore-overlay-scrollbars.patch
 	# Make gspell and python optional
-	"${FILESDIR}"/3.36-make-gspell-optional.patch
-	"${FILESDIR}"/3.36-make-python-optional.patch
+	"${FILESDIR}"/3.38-make-gspell-optional.patch
+	"${FILESDIR}"/3.38-make-python-optional.patch
 )
 
 pkg_setup() {
@@ -66,14 +65,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use vala && vala_src_prepare
+	vala_src_prepare
 	xdg_src_prepare
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
 		$(meson_use python)
 		$(meson_use gtk-doc gtk_doc)
 		-Duser_documentation=true
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index 0d2d1f533f3c..8a7d0429c49e 100644
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
@@ -14,27 +14,25 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
+	>=dev-libs/glib-2.64:2
 	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/libxml2-2.5.0:2
-	>=net-libs/libsoup-2.60:2.4
-	x11-libs/libX11
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+	gui-libs/tepl:6
 
 	spell? ( >=app-text/gspell-0.2.5:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
 			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
 		')
 	)
@@ -45,7 +43,7 @@ RDEPEND="${DEPEND}
 	gnome-base/gvfs
 "
 BDEPEND="
-	${vala_depend}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
@@ -54,7 +52,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/3.32.2-make-spell-optional.patch
+	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
+	# disagree with; those wanting them off in general would set that globally for gtk
+	"${FILESDIR}"/restore-overlay-scrollbars.patch
+	# Make gspell and python optional
+	"${FILESDIR}"/3.38-make-gspell-optional.patch
+	"${FILESDIR}"/3.38-make-python-optional.patch
 )
 
 pkg_setup() {
@@ -62,18 +65,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use vala && vala_src_prepare
+	vala_src_prepare
 	xdg_src_prepare
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use python plugins)
-		$(meson_use gtk-doc documentation)
-		-Denable-gvfs-metadata=yes
-		$(meson_use spell)
+		$(meson_use python)
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_documentation=true
+		$(meson_feature spell)
 	)
 	meson_src_configure
 }