gentoo resync : 28.04.2021

4 files changed, 13 insertions, 65 deletions

diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index abadc1b587c7..eb913d8df40d 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-maps-3.36.4.1.tar.xz 4006432 BLAKE2B c5c51faccee3e67be08279748dde270716ddf773266f678d1fa573ad4dbf9af95ea53c5c4e548e1c2eb296030371bd693f301ad3a43d2d88e00ac77121ca7834 SHA512 e63f8fe0b0c9226e8393bba4f4db6bc655a45cc869bb247ae51bdb06d69ca29785c562f98294c079cc3fc5c56276f10152c8c8e0ec8d46399918d9cd155e63d6
-DIST gnome-maps-3.36.4.tar.xz 4006520 BLAKE2B 4fb76e23580556c357c5a4a246a250521472a4b264264ea0e6172b2a61583f63e297fef29060b1b30a8978e509820d22eda2e6d56eda69f97e25e9795dcf38b2 SHA512 530ccc0a25c0a1fee2411ecc4034981210836664acc7adc6aa9cff9304e2499c1205f9c27b6b692fdee152fe1750541a1966d59a60958f3592682a5e110d490f
 DIST gnome-maps-3.36.6.tar.xz 4006804 BLAKE2B 4d7684a13b5bace21e7a9d6b97b9b4b91a6fc5cbdbc98c1a776f157c5b1747b16669602e6167afd254d4fe72f8c4d7c9ac27c22089efd07839a6f35bf68b1c31 SHA512 bd72ede45edf851fdbd815278838c34b42145fcccb18bd33ff5e732238797eadc0fe4e0279072c0dd9bfd7b5d88329d8e537ceb3072e186fbc213d63cdef1e72
-EBUILD gnome-maps-3.36.4.1.ebuild 1395 BLAKE2B 9e3bda52a28a2a22dd9c4bdb1ab74a5fc4711f0e32334fea0857a3e0929d5948e6d79ba495df40f184c01ab89db42b870fb8d1215dd53ce31b7e424ab80503b5 SHA512 24fe4a2e948be7b42a97a7a870d3b0b5727c4d8ca611d564e24c7acf8b0a7f227b0a6560d8d4b4b0316e8320c1d6c2cb6fb47b40e9a81a90f1bd1d58685eacb1
-EBUILD gnome-maps-3.36.4.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af
-EBUILD gnome-maps-3.36.6.ebuild 1394 BLAKE2B 9fc4b208bf5956d96b044864d887ca7e43b00d63de07d213d1f1f97d07ae8bc47132b75d84f93167e92a24c6527c32c1146acec2d0b0c396449739eeb0609115 SHA512 38839b6eeac13515120a731552f3a332689afd7520890f43070fa57e8b1e56eb146abc7c77650326677a46920c93409bb7ae60e3db062e3db12497727196dc8f
+DIST gnome-maps-40.0.tar.xz 3540952 BLAKE2B c41a79ce5966a3dac903caa7b98651b7734d8a55b37de5e330e34dd0db0f146a6ca247c82a8d0f07ec5f55b1efaf40d6f86d4fc35ff750f09a565c0edcde6702 SHA512 6ace3c43b1578b278e39fd27dabe9ab62a4ae80ecf1fb42fe3b8e3e208d43e6fd3325b4c61c6de7c05fcc3321178d556d8fafe0e6d2c7c0a924248b9832fa25e
+EBUILD gnome-maps-3.36.6.ebuild 1395 BLAKE2B 9fbc0e4599e1c6471f704eb742c50264a07c61e1f125c2ba48ac9c026489ff9194db57a97d9dc15e88e42555f55e1d60f66c52d1fba4969f709e15ac432d727d SHA512 abf9ea43d5a4dcb4b2549ff99b30e6f3ec243b617631c68024bf5ecc4d773ccf38fa32ab311418665f20586386b2564ac875503c2e3c4fa0e097d674c84b1e7c
+EBUILD gnome-maps-40.0.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild
deleted file mode 100644
index 7927bfa15a56..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson 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 x86"
-
-# Pure introspection dependencies found by grepping imports.gi in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	x11-libs/pango[introspection]
-	>=dev-libs/gjs-1.50.0
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=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="
-	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-3.36.6.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
index cd66078597a1..1f388bc0f3f1 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
@@ -9,7 +9,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 ~x86"
+KEYWORDS="amd64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
@@ -20,7 +20,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.22:3[introspection]
 	>=app-misc/geoclue-0.12.99:2.0[introspection]
 	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10
+	>=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
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild
index cb8141452d75..eb37149677c7 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="A map application for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
@@ -13,14 +14,15 @@ KEYWORDS="~amd64 ~x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
-	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/glib-2.66.0:2
 	x11-libs/pango[introspection]
-	>=dev-libs/gjs-1.50.0
+	>=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
+	>=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
@@ -37,6 +39,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig