gentoo resync : 28.04.2021

4 files changed, 63 insertions, 13 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 9cbf9f0ac603..c71c4089f952 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,8 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
-DIST devhelp-3.36.2.tar.xz 302996 BLAKE2B 61131c7bedfe6803c04315138b017145e7ad7cc2939022a4cfcd0c65f4f3144db705a4a918a4ecd6a6fcea2a5dce64a891d951ccfc21dec0421991455b81ad16 SHA512 8852546b8ff337c2448a88b931803029825e34a6cf906370c683ac004866a548c9de79c934fde36ec04584f0bdc59eee4184b9ed8a480303eb78b9c9d43eb55e
+AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
 DIST devhelp-3.38.1.tar.xz 313948 BLAKE2B bd070c98e92a8968ffbac7e634c19730e7c63ee18d180a5d9dda7d831b28deea49a7aa50b17ca9a8b5a411276ac055074cb76ef8cde5017ca395d49bf4aecdf6 SHA512 bcdd61cd822ae3fbe2c9542c09d058760fc1fa0bbbd55b1fc0853b4fdbf1c3856d4fed8f2263f94f41096cbdc0a76394773d43a9072d8aa89274fa61a3c2a430
-EBUILD devhelp-3.36.2.ebuild 1787 BLAKE2B a80d4969d643e8be5a2731773bf6b2e4ba5907683d0e226d3335686715394a25b49c15459ddd6c67bb02f361d8ba525e37073ee98b16955e1ca60ae11d9544cf SHA512 706ca4954c37b7f573af6c0369f0378fa8d07a2eeadef9d70e33569b93f6c4299b72d0c209412f6fcf74eb4841e59da04986fd7476bd7eb1f4399d895f27bf43
-EBUILD devhelp-3.38.1.ebuild 1789 BLAKE2B 14b666235603efe3a2d6444c9b7a009c049b1dbf96544ef4b36f1d5a4c66e83dbc599dafa97dfb4c1d39cae22f3ee5d8d8a1a3b6a692a928e0f48aaf920f7465 SHA512 e20a0077fe23196cfdf96d418e83106f13a55ab2605ab150e260a6b1ac901891d0cf43481018e0a8def6ce2de00b00edc30f2140f41ff4bc6f6db6125f00889f
+DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
+EBUILD devhelp-3.38.1.ebuild 1788 BLAKE2B 6697d9d94789714dca28907e7a306a68ee66eb04c905c48467f28adb743aabaf467b01fff04eee4b0f4a96011826ab73cdae0e545828a420b9a51cffff833a17 SHA512 6da00c8e9ebddae74d8e4b33e22f6c46c59f7f26b1203ae9bbef4abf28bf3369e3beb1d88ae0c2deec834f73d7ea50de55c8fee0bca8d2c837bf6d4f44ef308c
+EBUILD devhelp-40.0.ebuild 1789 BLAKE2B 96e4d2d314b65f91f468529d5211ddd574cd3678ecaa2c5f37cb51046114dc3187cd3a69ab945afb4dc9a3b7f826a250ee602f171b88e7c62eb354eeeda82f8c SHA512 fba1969812aab88bcf9fb0ef4dfa83f1eacc0dd93a5a0312c843701c83aad46b3fdac8c93c572f47ce6d9a4b2178bbf905fc659687066bcc4e9461c614030ace
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.38.1.ebuild b/dev-util/devhelp/devhelp-3.38.1.ebuild
index 605c2cca3a83..b24e807cb834 100644
--- a/dev-util/devhelp/devhelp-3.38.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.38.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/devhelp/devhelp-3.36.2.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild
index 7abac804f28a..8814cb624063 100644
--- a/dev-util/devhelp/devhelp-3.36.2.ebuild
+++ b/dev-util/devhelp/devhelp-40.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -11,12 +11,12 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="gedit gtk-doc +introspection"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="+gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
-	>=dev-libs/glib-2.60:2
+	>=dev-libs/glib-2.64:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	>=net-libs/webkit-gtk-2.24:4[introspection?]
 	>=gui-libs/amtk-5.0:5
@@ -40,14 +40,14 @@ BDEPEND="
 	dev-util/itstool
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
+		app-text/docbook-xml-dtd:4.3
+	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
 PATCHES=(
-	"${FILESDIR}"/3.30.1-optional-introspection.patch
-	"${FILESDIR}"/3.30.1-optional-gedit.patch
+	"${FILESDIR}"/40.0-optional-introspection.patch
 )
 
 pkg_setup() {
@@ -57,9 +57,11 @@ pkg_setup() {
 src_configure() {
 	local emesonargs=(
 		-Dflatpak_build=false
-		$(meson_use gedit gedit_plugin)
 		$(meson_use gtk-doc gtk_doc)
 		$(meson_use introspection)
+		-Dplugin_emacs=true
+		$(meson_use gedit plugin_gedit)
+		-Dplugin_vim=true
 	)
 	meson_src_configure
 }
diff --git a/dev-util/devhelp/files/40.0-optional-introspection.patch b/dev-util/devhelp/files/40.0-optional-introspection.patch
new file mode 100644
index 000000000000..d4c00d369d63
--- /dev/null
+++ b/dev-util/devhelp/files/40.0-optional-introspection.patch
@@ -0,0 +1,47 @@
+From 6c982d00f9d6f03f916bb6a572e7f938cd56fa74 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:44:40 +0200
+Subject: [PATCH] build: Add optionality for introspection build
+
+---
+ devhelp/meson.build | 2 ++
+ meson_options.txt   | 6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/devhelp/meson.build b/devhelp/meson.build
+index eef055e7..eeaa51eb 100644
+--- a/devhelp/meson.build
++++ b/devhelp/meson.build
+@@ -120,6 +120,7 @@ PKG_CONFIG.generate(
+   requires_private: LIBDEVHELP_PRIVATE_DEPS
+ )
+ 
++if get_option('introspection')
+ GNOME.generate_gir(
+   libdevhelp_shared_lib,
+   export_packages: 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+@@ -140,3 +141,4 @@ GNOME.generate_gir(
+     '--quiet',
+   ],
+ )
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 17dc85f5..c69a2906 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,12 @@ option(
+   description: 'Build the API reference'
+ )
+ 
++option(
++  'introspection',
++  type: 'boolean', value: true,
++  description: 'Build GObject Introspection data'
++)
++
+ option(
+   'plugin_emacs',
+   type: 'boolean', value: false,
+-- 
+2.26.3
+