gentoo resync : 25.03.2022

4 files changed, 60 insertions, 36 deletions

diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 76273fc71802..2b4fcdae031b 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,4 +1,5 @@
-AUX gnome-maps-meson-0.61.patch 916 BLAKE2B f2affee9ce30596872b806da7833ec5f9dcf21db26b3ff2f5b9688b45658f40388c7103bbb0dd03de314c5d5e556c91229b86afda7f2081b876d8dce9b4c6af8 SHA512 a201b6e631c8bf8dc6d15c864266414eb659740d34bdfcc3fa021ac03c6585012e921c77135acde6b4be06fc2f1e7828e30de4ca2e7595f72b4f082bc6b00092
 DIST gnome-maps-41.4.tar.xz 2187076 BLAKE2B bb35925d1b69d50c65e3ffe68386242b776c2089bea3b2bfe88383f1a8fba4045474a1c8fc1c5d07a5b207ad953396d3a76af77fbdf984d286b5e242f9eea78f SHA512 605de671f85ae38a8dc79e58594f2170215e8a070377b1d9ebded9891425898bb40613f6acee1c95f5ea2e0d95e6a8c25757665a5aa890831325701b1abbc8fa
-EBUILD gnome-maps-41.4.ebuild 1507 BLAKE2B dfeae112e815cfa9a3d7bdf021a988ac539366ffaba065fc901331b24a8a9f90fc3cb677f21bb26c5781b4b4e5920f02c9e1be6783a4d73cd0e5ec7bf51fd66f SHA512 cedd81bde40b79aa4889714186375d8796ffa78d1dd6480476b894a5f9da6700e03feac73c5d0e959ffc81e6ad73b29ef6fa2f52bbe64f929113eb924a843ab6
+DIST gnome-maps-42.0.tar.xz 2315828 BLAKE2B dca0f7845b257780701186adf3408cf41797b235969dadf1fe73003b9e52b3ab26d39f8190336616d697bf87eafb2e1abd05a4da9de4837153237fd08e382854 SHA512 888caa6418a8afea6d334b90f28eb865e3955c0534df25d458e6b3a063944d09c46a3775a3d4953a968980446f2be69bd0c5c4183b3fc8419ed1f7bbb812429c
+EBUILD gnome-maps-41.4-r1.ebuild 1510 BLAKE2B 3a928ead826d4e54969b224c9f59da2239b542bf2f6e9f364e3bfc185717473aec4a1563174852fbefaec37fa20e3f8cee42eaf88e3a5ef25d80d7b7461c0f04 SHA512 f29d8940faa247f70ac479bf6dd3c968a5552c7e7a1d57831e9765e0716fa180794fec79932a3d5d46caed3c32d8a999ceb368fd9d1aee281a6fa988266fffcf
+EBUILD gnome-maps-42.0.ebuild 1513 BLAKE2B efa10f438002651620d1bdbeb8660de33491e3b888ea7bc8a0c253e2ca1d7d63544f7f9514d0602e34b2cf74b9a7591ee1a54631caf76e7a3c95887a07de77c0 SHA512 f4d5a4a18964f4548f9337b6d7b1ea6f10db9766a7966b8473d3c266d7bdbe3764a7ce1f80273c1c022dced4d388b74c0240f09ce593e94aab1372a4d26f70b4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
deleted file mode 100644
index 1ef4d4555c93..000000000000
--- a/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/831655
-https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/def20cbb26e59e5023fe157e691de48d7afe7210
-
-From e81cbf910755c0387677a43a7427da4ec073e1eb Mon Sep 17 00:00:00 2001
-From: Marcus Lundblad <ml@update.uu.se>
-Date: Fri, 14 Jan 2022 23:33:43 +0100
-Subject: [PATCH] meson: Remove unnesseray argument to i18n.merg_file
-
-This causes a build failure with meson 0.60 (or later).
-Remove it, as it's ignored also for earlier meson versions.
-
-Fixes #418
-
-(cherry picked from commit def20cbb26e59e5023fe157e691de48d7afe7210)
----
- data/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2be4ee73..4ef7eba0 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -33,7 +33,6 @@ install_data(
- appdata = app_id + '.appdata.xml'
- 
- appdata_file = i18n.merge_file(
--	appdata,
- 	input: appdata + '.in',
- 	output: appdata,
- 	po_dir: po_dir,
--- 
-2.34.1
-
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.4.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild
index d8c1777a2930..85aac7b81b42 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-41.4.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=net-libs/rest-0.7.90:0.7[introspection]
 
 	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
+	dev-libs/libgweather:2=[introspection]
 	media-libs/clutter-gtk:1.0[introspection]
 	media-libs/clutter:1.0[introspection]
 	net-libs/gnome-online-accounts[introspection]
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild
new file mode 100644
index 000000000000..918462359832
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	x11-libs/pango[introspection]
+	>=dev-libs/gjs-1.66.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libhandy-1.5.0:1=
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10:=
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather:2=[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}