gentoo resync : 09.07.2022

9 files changed, 153 insertions, 4 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 302777eea970..d64ddf457acc 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index b94b14b55e7c..ded75ca86ca4 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,4 +1,7 @@
+AUX 3.26.3-tests-Fix-locale-in-pi-test.patch 1287 BLAKE2B 5b177f4bc116823ceec58971836d33c733f338f21db3d6109213b929c03e8ddf22a8b0c34edc40c8cf5fa50745a7c7907d1ce408647975d29b6fdad721d29420 SHA512 b8c21c64e743e8ef8dfa662c9d46f4cbe7ee075e17ecbe2f9d5589e6b33ea3f9681b68be03fc9589fb9f22d219ee6241f3a0ca6b40ab0538f5d2a05a82ae2724
 AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
 DIST geocode-glib-3.26.2.tar.xz 72956 BLAKE2B 40a32fb0ba61cd91b28e57c518dc5450ce89a16889a335d19fe722c1088a4cdb085237d1fe24d08eeac62581ac68895a7a2b432d66f46fc4e03466485cfe5060 SHA512 b3ef81fac6959f6c4725ca721125cdafbbec69233f321872e17f9035266ed7616018ef54a9082fbd0a83395d18c664144cfe3b431d63744be433f058071cd435
+DIST geocode-glib-3.26.3.tar.xz 75148 BLAKE2B 8eba0cb40511a724cddcab659fe0720b0c0534d811c83f8a90d21b9153af242de2a69b2c882b3eb3008ac128d1631a2ac7692c5e000284579aade987334f6cce SHA512 42313b1da24f5256ad73bd4be366d6bacf35256acc098e4865bbff58e92c5b78f4a2537e4787c6387190f10a2be2a72bc1507f7cb436e096e772195cf30fca7c
 EBUILD geocode-glib-3.26.2.ebuild 1125 BLAKE2B f90a580eaa668a355ac147c9d286057ea29185fe2723d88c445ded968c334f8b9e579d0565a555c1888d7780014ef8c31078aafe11bdf9f293b672f704dad108 SHA512 98d7301de3f74df03afe79e830c3051b3c29174abbdfcaef14e140d3f1b4baeb46f1ebe7b4eef87e611658ad7915b452c173ace9c0692a25b32ca5338d9a1350
+EBUILD geocode-glib-3.26.3.ebuild 1045 BLAKE2B 08fd645e5b2d9a857c905a25cba67a6c1ec3af066ef61500672046ed7ddb19c5c7a369830e249ab54f5b4101f73b57fc596ebb1f1aed9ae903d33b2d9a6ffff3 SHA512 e5e859bf2ee88e974497c39a11e45c0f5bd823bd2041851cf3c75873cfd826cab593255140a7b8c88ff61d63948148e8e46831f2ef9fa9db498fff0194a11fad
 MISC metadata.xml 417 BLAKE2B 887efe27b7afb861a1da9dd6f3a8bdcbf515e0db4993e6fc897e376b4b4efb7607ede8057ab3a9a1d2ea7c375e27fe6a465f781b0de0d628158cd01d414b9089 SHA512 83a96a8542a501f30f0b1c072f74731b36602b9146003c15e9596318db776b048a46dc0a85a9864280e26e848a08259da51043aee008447f230fc740a56d9968
diff --git a/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch
new file mode 100644
index 000000000000..5df7814383c0
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch
@@ -0,0 +1,43 @@
+From c9bbf13d76600492565fa042638b48cb737e492d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 2 Jul 2022 10:11:10 +0200
+Subject: [PATCH] tests: Fix locale in "pi" test
+
+The test expects the locale to be en_GB.UTF-8, so set it as such.
+
+Closes: #27
+---
+ geocode-glib/tests/geocode-glib.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/geocode-glib/tests/geocode-glib.c b/geocode-glib/tests/geocode-glib.c
+index f74d031..ef20716 100644
+--- a/geocode-glib/tests/geocode-glib.c
++++ b/geocode-glib/tests/geocode-glib.c
+@@ -410,10 +410,14 @@ test_pi (void)
+ {
+ 	g_autoptr (GHashTable) params = NULL;
+ 	GeocodeForward *object;
++	g_autofree char *old_locale = NULL;
+ 	GError *error = NULL;
+ 	GList *res;
+ 	GeocodePlace *place;
+ 
++	old_locale = g_strdup (setlocale(LC_ALL, NULL));
++	setlocale (LC_ALL, "en_GB.UTF-8");
++
+ 	/* The query parameters the mock server expects to receive. */
+ 	params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+ 	add_attr_string (params, "q", "Jack Cole Building, St Andrews");
+@@ -439,6 +443,8 @@ test_pi (void)
+ 	g_assert_cmpstr (geocode_place_get_street_address (place), ==, "North Haugh π");
+ 	g_object_unref (place);
+ 	g_list_free (res);
++
++	setlocale (LC_ALL, old_locale);
+ }
+ 
+ static void
+-- 
+2.35.1
+
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild
new file mode 100644
index 000000000000..f8360512af4b
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.99.2[introspection?]
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-tests-Fix-locale-in-pi-test.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-installed-tests=false
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Dsoup2=true
+	)
+	meson_src_configure
+}
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 76e0827f4e00..9aaa8cbe4ed6 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-maps-42.1.tar.xz 2315924 BLAKE2B a2bf6eb8bef69c80febeffc29294840b701a207d5b6479dabae4daa13de4b5325319314bb755d44fa5ec41bae397af1e642950553b6c36be29f8a68109c15b3f SHA512 a01bf5eefa541542930e53750ac216cd93e4b409a171b57ed18525020cd2dc55db596ab68885ab9d607999c971f8e4ec2b746507157aab32b863a17a222a6fc2
 DIST gnome-maps-42.2.tar.xz 2317216 BLAKE2B 2a485c15ad203fb4518541a60231a0ed756ca3cf7abc524911a2294b3503077d0974ecc8690073e3967241a8769687a1524506a42bea8c473192128cd2ae9bb7 SHA512 87da3b6850d1a7ca4d90781089800f082026406555773ea1a9bac376b41e480eb4b5a10ec3f0a2f85de521e847489f4e761117a08e7125447aab7acf05720c1f
+DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
 EBUILD gnome-maps-42.1.ebuild 1511 BLAKE2B c0edb29177474b6e13a7ca394e06e758bb75b07cb39a89a1dfddd3269b620b47574d05ddcdbb372ddc3f8bc449abb95e648ffe9f34b484570be1a2806e1c9ae8 SHA512 31c4e0a5883c18e4550d8e4aaa59fcfee2887dcf268f6e53fbc8ae1f2c059ae910f48d54860988a2e000bb32ceffe4862b3fdf37f5dd28a5609a703a61f884cd
-EBUILD gnome-maps-42.2.ebuild 1513 BLAKE2B 0cae9b16d9347a46f0c532e674ae8f4fdf1ae749bbd0c3d0cca2b3fe7d8101255d1fbc18b9e130f2bdfdfae6c57db251bcb3f80545eaff58bf52c46561fe13c4 SHA512 215014a6ef523fe778a1e7a49401b8b23d51f61e0e2378577bfe732c5945b7ddb4d97be3b823dd0f7cede2a350ee19898a7b7111cfef89fddffb5b0606c1a011
+EBUILD gnome-maps-42.2.ebuild 1511 BLAKE2B b5d321ede1447825f64ebb490007eb3d5f9dd85e406919c7c59ca2a56ba468a3088e4dee0917328a6116314a76bdb93ba2cc34ba456250765d767a3e47d85af7 SHA512 395b27a856ec65874c4058ca77da0cb97f671c5d36bf4dbb7d373cde9a69b0b02435f0663c47516bb2ad62d0b3328c7b181285276f34a9d5c7f28fd95b62d902
+EBUILD gnome-maps-42.3.ebuild 1513 BLAKE2B 0cae9b16d9347a46f0c532e674ae8f4fdf1ae749bbd0c3d0cca2b3fe7d8101255d1fbc18b9e130f2bdfdfae6c57db251bcb3f80545eaff58bf52c46561fe13c4 SHA512 215014a6ef523fe778a1e7a49401b8b23d51f61e0e2378577bfe732c5945b7ddb4d97be3b823dd0f7cede2a350ee19898a7b7111cfef89fddffb5b0606c1a011
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
index a8c7b50184bb..405947257539 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.3.ebuild
new file mode 100644
index 000000000000..a8c7b50184bb
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+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:4=[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/grass/Manifest b/sci-geosciences/grass/Manifest
index abc63235731c..a3e041b334c5 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -6,6 +6,6 @@ DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea1
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
 EBUILD grass-7.8.7.ebuild 7037 BLAKE2B 6c49c86b9360199a2b47340241d6ba7d350e91dcedf9d5e8f732e97ec624b312b75a36e520949a38a9c5684c0fac3fd85113fcebb0ea0886ec815045566cb3a0 SHA512 e24b41c9754db9edc469d9095d9f97303ad703e047e0ab6810afb5f7b42e28c453a5c0f2292f71b6bc2acd0fa4157e172fbae7966f456ef2eb7fb938f747bb75
 EBUILD grass-8.0.2.ebuild 7395 BLAKE2B 26056fd3435579cd5c3582eb161a5555480da272f451c079eda08682d1b4c9abd2bf8c1dc0d0f03f9339c39357d91850a27317101fe4f50599da04df327609be SHA512 d3dfdcc2e453fbf902418bb0f6240e1a9abcbade55b9419ec0e5cc75ec1949219c2e411b1512d1e0a5e876366fb0bfd2fc34f7c3bb9d8428f67366b6fafae9a8
-EBUILD grass-8.2.0.ebuild 7397 BLAKE2B a6bb4a9721446eaf6ee91fe5f29153b7d7326d2d0c1eb5aeaa3bac6245e53c3c07abe0be711289981ce7a5e69a716b4a1086de948b80711e75048b132931c6f7 SHA512 2af79f67086685086cdf3b838f985a93e95543ceb3784fdaee48b30de85360722f83bb7075082637dbdeb500bc3a84b91b39adee7467e0dffc9bd65d435929b8
+EBUILD grass-8.2.0.ebuild 7395 BLAKE2B 41f2cd26b480123221e1458167cb60d19a5cfdb450004a29e962c56d5c4737775614b63c82c928e2d9830fb14e37da5cfb4656762fdefbd62c9700255bc52652 SHA512 35bd856f050fa9be013b6c7b8911255a5f85e06cfc66609502e5a8b826816e2f43b9e4ca834eb905a6b7426db0d4b7f50ba595a35655cd9a086b7964c8eebc72
 EBUILD grass-9999.ebuild 7337 BLAKE2B 9e735ae65498174408f482f8f5f568c57c351113390a1836227f9787a5c5cde9fbcd22191ecda0dc1078e3ec7cb3b4a39bf75d087d6d23dfd36c892d479ac525 SHA512 364c581b765c13026d59f41123c34943b40e87307102a41f3b2906232cc70c7dad423c2fcc2bd3ebddd77bb8c36be78d206a218665365804a16567578fb0c43d
 MISC metadata.xml 1286 BLAKE2B 0f08cfaa427449162c2820db80f4d306c73bdf6a9edd337be482df034e40ace5fad0ab2f7acb08b3bde5e1db54ed9f9ac38669ab689968c30964aae15b4134a7 SHA512 2adc25985ec839ba9d1b9b15a196b3477f4a92cda7d83dfafa9259d88768bcc57ab559f45820314b9ad7dc8ce3d25332eb6a8e7500ce26d7b53011a90bc99211
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
index d326298a52b2..6edce360ce6a 100644
--- a/sci-geosciences/grass/grass-8.2.0.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -26,7 +26,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
+		KEYWORDS="amd64 ~ppc x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"