gentoo resync : 02.02.2022

4 files changed, 57 insertions, 86 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 45b66621aa5c..2f73cd74dc5e 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,10 +1,9 @@
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
+AUX 41.2-meson-0.61.patch 1775 BLAKE2B b169bd8ea9d84c074426219fcf9b2a37557490c1dc3a2e647016b6c46d2ecbc02000f9595da9375cf9a4b00d22c95ad831ef72fceb3192030bcefcdc073afe8c SHA512 50500f5ddaf5eafb1299f24d1b1dba4b0808c9a140f1d7c0748cc73d8da25e0a444bcd1a1293c331158a3f0f96af1ab9cb27c37498437f0bdbffb191d93777ac
 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 1782 BLAKE2B fc580fb91d5b1e1733c05f948f6bb2e1f83da617d41d4e1bd1ad979228d290cae44b34de858532039c7573d8daa52ae2682d68fa69f0a6d515014e04d1adae8b SHA512 3d05ba5f0e9f1808139bf6a6ec3ab2f731e57fe65fe474904ae1abc81d07932021c47a0ccee67f2489a709772bfcfe0e7aa2e9d1d43992bda3c8f33e8a79531d
-EBUILD devhelp-41.2.ebuild 1950 BLAKE2B 707e82f453d1959713c344f411d4b81898b30e1abc403658f5345911acfc66d15f3014f7fbdc0f06f6627bfc2b7e2338859306258f823577d7adad6cc10e19e1 SHA512 b93484e9b1002c34a219af0ff774340a3d932cddfbf3dafcf3fef81c3f53c7a070ad82234a48294fa2c01f19b178b177986678d801f0dc8662840fbec135b61d
+EBUILD devhelp-41.2.ebuild 1989 BLAKE2B 8a64288acb6bc746158af8890ab7a9f3a0b436e1d74238312ff255cfb37d9f2d1e8ee51284bf571422d09f7dcfe1e07b328ab8988cfe88e952451a4f2594db85 SHA512 f84905e5724fb34965390e9003fd422aec3beb2a393cfc299dde8e25eede93509f99cdd4568a9395b267481ecbc7c1b08afd1e413b1941bd9920370742d81eed
 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6
diff --git a/dev-util/devhelp/devhelp-40.0.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild
deleted file mode 100644
index 6fd8e3d4278a..000000000000
--- a/dev-util/devhelp/devhelp-40.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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} )"
-
-DEPEND="
-	>=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
-	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/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/40.0-optional-introspection.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
-	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/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
index 0d4bb96937b5..7892dd7fcbf5 100644
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ b/dev-util/devhelp/devhelp-41.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PV}-optional-introspection.patch
 	"${FILESDIR}"/${PV}-webkitgtk40.patch
+
+	"${FILESDIR}"/${PV}-meson-0.61.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch
new file mode 100644
index 000000000000..dd75f802056a
--- /dev/null
+++ b/dev-util/devhelp/files/41.2-meson-0.61.patch
@@ -0,0 +1,52 @@
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch
+https://bugs.gentoo.org/831928
+
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:02:20 +0800
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments and
+explicitly rejects with error "ERROR: Function does not take
+positional arguments" since meson 0.60.0
+---
+ data/meson.build                 | 2 --
+ plugins/gedit-plugin/meson.build | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c6aeffb4..0bc531a2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', APPLICATION_ID)
+ appdata = APPLICATION_ID + '.appdata.xml'
+ appdata_file = I18N.merge_file(
+-  appdata,
+   input: configure_file(
+     input: 'org.gnome.Devhelp.appdata.xml.in.in',
+     output: APPLICATION_ID + '.appdata.xml.in',
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('application_id', APPLICATION_ID)
+ desktop = APPLICATION_ID + '.desktop'
+ desktop_file = I18N.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Devhelp.desktop.in.in',
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
+index 4f779886..877a01ff 100644
+--- a/plugins/gedit-plugin/meson.build
++++ b/plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+ 
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+-  plugin_info_file,
+   type: 'desktop',
+   input: plugin_info_file + '.desktop.in',
+   output: plugin_info_file,
+-- 
+GitLab
+