gentoo resync : 02.02.2022

5 files changed, 45 insertions, 61 deletions

diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index b27dd420528d..f4bb2b5d6c3e 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,6 @@
+AUX gnome-maps-meson-0.61.patch 916 BLAKE2B f2affee9ce30596872b806da7833ec5f9dcf21db26b3ff2f5b9688b45658f40388c7103bbb0dd03de314c5d5e556c91229b86afda7f2081b876d8dce9b4c6af8 SHA512 a201b6e631c8bf8dc6d15c864266414eb659740d34bdfcc3fa021ac03c6585012e921c77135acde6b4be06fc2f1e7828e30de4ca2e7595f72b4f082bc6b00092
 DIST gnome-maps-40.5.tar.xz 3542648 BLAKE2B bbc45882e314667def29b8d7491afba2e1649ef62a6898a58b4afd93bd26537af73588d9cecd0ed06fc53c8083ade6d33f468b4a51481886d30abdc13558be80 SHA512 1d53dda1b96fb5a6db4152380f9136f2e66cbc0062434254cc0b47e999c19dfcbde6bc1d6bc787474eab83b29293a1e207cf41b177f7cd01b29ccb15a6628d15
-DIST gnome-maps-41.1.tar.xz 2187384 BLAKE2B 792ada987c513118411233b477373db015e55b5c4da2405d40f69833fbce3d0fdfec4c194fdfa762d5642039c4965db9a606d6206e8c52b16a4f7c26ae9b54ab SHA512 ff750c009c0409bdf87a08b2a89296f5f214f8fa294c7470e99841fc6f155ae14cf9bfd388a65231e03c4c4fdbe5606c90b2bf5897e756a1699a19782f89a5db
 DIST gnome-maps-41.2.tar.xz 2187460 BLAKE2B 83f93f9cf371e4275cb73e9a847be6400a4f736fe605266a1f371bc03af13b37af3bae04d5d0a7dbddd8605c099af92030ed8dec555f1f1b59339c9f907b3b21 SHA512 b0f167797986224d5b51df4be44731409241935513f6863ef844121b8b29829ed6ba1e37a2478b93e79dab5f9825e1632ef74f576f37990c9f9779b8de24cddc
-EBUILD gnome-maps-40.5.ebuild 1500 BLAKE2B c4ada54156ab4d3faf9f6991df7cca4677f6e50165b742545e38d2b3997ba2670b4d08ea4e503f710a2468e365829a225801586edb12a61a00f124a83f119612 SHA512 150c00848281da75a4cabd680686901bc9d4d547e15c26aa44c30fb7c647760d201f28dd754e6dcbfd0176c989b6fdcabbfd035b98c4ecc99dbe869e0cddfdf6
-EBUILD gnome-maps-41.1.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
-EBUILD gnome-maps-41.2.ebuild 1509 BLAKE2B 173f08541d5c370677bd42b4d440b88da47cb3affe90a59e0cfe99759c41d45d5e382de06a5fa55eba0e2e86ce1b3b96c12a59477c17268b7d116a3145858b15 SHA512 5394e17c69da91212dde8efff026a643e7ae2f9631633bf5fb81ab7cdabe9d180dec6eb7deacb019f96e9030f54ab9237dcd44df4ba7743c152873a106e1829b
+EBUILD gnome-maps-40.5.ebuild 1556 BLAKE2B ab90b78a02ae92718e4e351286a82c29148746012c8ac9a28380a562eb0b6a39851c863b7668226a0a763853b8368e5e17304844d4f8be2ef6b594364b3c28ce SHA512 1b0b7a229feba6a6f8114d5fa53d6b1942778eabf5da1f95dd7a3ef27b77bcd70a07176ada416a67c5ff5fa966f659bf3c351a14b4f7cbf001aa2449213169ef
+EBUILD gnome-maps-41.2.ebuild 1565 BLAKE2B dfb99da4d0b3a191d0d4651437125936c4e8ca930f16ef5a2def6c18efcc8f5b185b9610508234ba2be8aca3426dce0c3d794d3b4bc5f2a4cf5e59ceee19273d SHA512 3fe31768485b7004da5c2efdcf818ff93a1ea892db640edd3dab7812bebef711d1bf48aac2c08a219b26d41372fb7b323e4e63eace34ff91bd12a71b540feb32
 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
new file mode 100644
index 000000000000..1ef4d4555c93
--- /dev/null
+++ b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
@@ -0,0 +1,33 @@
+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-40.5.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
index eefd96359122..a710f389c1d4 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.5.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,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/gnome-maps-meson-0.61.patch"
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild
deleted file mode 100644
index 5ec15782805f..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..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 ~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-0.84: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[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
-}
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
index c14cf93f29ac..678e95e601f2 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/gnome-maps-meson-0.61.patch"
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update