gentoo resync : 08.10.2021

5 files changed, 174 insertions, 2 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index b0176d406a24..7ca76598b127 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,6 +1,10 @@
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
+AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
+AUX 41.2-webkitgtk40.patch 1174 BLAKE2B 9c93f1d8b214f8569f560de51d3e8f308e2ecb4dd00f8dc1e4daef5eef87a785289c1ab53b94de0e8e75493015fa13669c1a7b0cdfe7750617275fa13e830a47 SHA512 22b45421fe5e0e312cff0128f98fce32f76a15b5316ca8a4065db3a300dc0e12e04ac2a0a6c47e47ca7ff49c4a4e0c2e0a4accd10981f05eb6bf312860da0138
 DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
 DIST devhelp-40.1.tar.xz 318172 BLAKE2B 83f71b66538b700790961e3dd3c7c7a75199f499a1fb32eb01e62fd5d11e72ae4e860bcfab2615bd4d417d5c57b89dad7eb2f1de4930e39e544d42b57a193b97 SHA512 4c541db9a2222dce4064f401c1d0a9f3233e2dbab17206358dfcce360286f69698248d08172fb236a692b125d8cd3a5bb76b6377b01b52c3d096fa4528400acd
+DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
 EBUILD devhelp-40.0.ebuild 1781 BLAKE2B ed190ff0984a757e3a3cfcbc7d9ac3fbd5eb97d516bbfa1c21931f91334364148fdb76bb436af362f1424a0981861497946fa77a1871db735a8bdc5ede77b52a SHA512 fe83470f41a3530c4ef091a63cd0de81cb8b9536a6f3f702427867e099e76a32ba977e4287e77647331fa1e30518990bd7a47496f87ef1d9d8d8f4692f166bef
-EBUILD devhelp-40.1.ebuild 1783 BLAKE2B 0b10069efd62a44037ed96bbb91c2dc68cf347d31dbeb8ee375802d2b1d766168ffe9878463fbf769a4dd0158b5e7460858e6c5bc29cb851429f8f7f5b302c72 SHA512 d57611c074e5eabb659b296218a9ddda644a587c41ccc363a15314456c246016137de7fa29a8e64201689430e677d5a1fdd09a0eb1a75b4e3c1734bf1da2bdd1
+EBUILD devhelp-40.1.ebuild 1782 BLAKE2B 38202c75264b5e6a4fed56f708be60cadb9360c4a3c6faaefeada22b6f16cde941b7c36a9c4788fa97c4ce94e7da9ca7d80b50dcecd01dddd765420a5ac6a5df SHA512 75a3b1a684f8439980e8ea4bd69ecd8f5c65dde227cc71d64ccbd281ce91c35c3f21f90e0f58df7a83aa03560f9a66fe16445908fb83523a7243d3c12468cd96
+EBUILD devhelp-41.2.ebuild 1949 BLAKE2B fd25bc35c116abf0e656848468a436692ff5a33699b4300bffa383fd04fc2b8aea2f13531d33f9fb00b4e8f80ae7c86eb80bd1f1c955cbb025e29248e9020278 SHA512 d417f767f6ea2c2a8fc96320ea165820a144608befaa0a5d7eaab969d5247b50e4c7db44ad8895a545d8865ae3e154da82bdfca54bb1f5d5345ce9e43f3673b0
 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6
diff --git a/dev-util/devhelp/devhelp-40.1.ebuild b/dev-util/devhelp/devhelp-40.1.ebuild
index 6c3ef63c21c7..bc2c2139331c 100644
--- a/dev-util/devhelp/devhelp-40.1.ebuild
+++ b/dev-util/devhelp/devhelp-40.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-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
new file mode 100644
index 000000000000..4657f906fe7b
--- /dev/null
+++ b/dev-util/devhelp/devhelp-41.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+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"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.64:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=net-libs/webkit-gtk-2.26:4[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-optional-introspection.patch
+	"${FILESDIR}"/${PV}-webkitgtk40.patch
+)
+
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dflatpak_build=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dplugin_emacs=true
+		$(meson_use gedit plugin_gedit)
+		-Dplugin_vim=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/devhelp/files/41.2-optional-introspection.patch b/dev-util/devhelp/files/41.2-optional-introspection.patch
new file mode 100644
index 000000000000..7fb4e719cbff
--- /dev/null
+++ b/dev-util/devhelp/files/41.2-optional-introspection.patch
@@ -0,0 +1,47 @@
+From 0e2e1de8015abc77ead34e25d9822a183b1f214d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 3 Oct 2021 23:51:25 +0300
+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 010e563f..fac15888 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')
+ libdevhelp_gir = GNOME.generate_gir(
+   libdevhelp_shared_lib,
+   export_packages: 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+@@ -140,3 +141,4 @@ libdevhelp_gir = 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.32.0
+
diff --git a/dev-util/devhelp/files/41.2-webkitgtk40.patch b/dev-util/devhelp/files/41.2-webkitgtk40.patch
new file mode 100644
index 000000000000..967d276bfa83
--- /dev/null
+++ b/dev-util/devhelp/files/41.2-webkitgtk40.patch
@@ -0,0 +1,38 @@
+From 7b0ef55edd63c71be209aa3b57e2190d4ce4fb90 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 3 Oct 2021 23:52:27 +0300
+Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
+
+That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
+so it wouldn't be picked up automagically once it's added or comes from some
+overlay.
+
+This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
+---
+ meson.build | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e57e466e..492aafed 100644
+--- a/meson.build
++++ b/meson.build
+@@ -46,15 +46,10 @@ lt_revision = 3
+ lt_age = 0
+ LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
+ 
+-webkit_dep = dependency('webkit2gtk-4.1', required : false)
+-if not webkit_dep.found()
+-  webkit_dep = dependency('webkit2gtk-4.0')
+-endif
+-
+ LIBDEVHELP_PUBLIC_DEPS = [
+   dependency('gio-2.0', version: '>= 2.64'),
+   dependency('gtk+-3.0', version: '>= 3.22'),
+-  webkit_dep,
++  dependency('webkit2gtk-4.0', version: '>= 2.26'),
+ ]
+ LIBDEVHELP_PRIVATE_DEPS = [
+   dependency('gsettings-desktop-schemas'),
+-- 
+2.32.0
+