gentoo resync : 31.05.2021

4 files changed, 2 insertions, 115 deletions

diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 2116144a797d..2297fcd58d32 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-maps-3.36.6.tar.xz 4006804 BLAKE2B 4d7684a13b5bace21e7a9d6b97b9b4b91a6fc5cbdbc98c1a776f157c5b1747b16669602e6167afd254d4fe72f8c4d7c9ac27c22089efd07839a6f35bf68b1c31 SHA512 bd72ede45edf851fdbd815278838c34b42145fcccb18bd33ff5e732238797eadc0fe4e0279072c0dd9bfd7b5d88329d8e537ceb3072e186fbc213d63cdef1e72
-DIST gnome-maps-40.0.tar.xz 3540952 BLAKE2B c41a79ce5966a3dac903caa7b98651b7734d8a55b37de5e330e34dd0db0f146a6ca247c82a8d0f07ec5f55b1efaf40d6f86d4fc35ff750f09a565c0edcde6702 SHA512 6ace3c43b1578b278e39fd27dabe9ab62a4ae80ecf1fb42fe3b8e3e208d43e6fd3325b4c61c6de7c05fcc3321178d556d8fafe0e6d2c7c0a924248b9832fa25e
 DIST gnome-maps-40.1.tar.xz 3543432 BLAKE2B adfffdcf6e3730414ebdf1da0727ee3c20d02b7e1c57f13070d5a08d9895d24f91ad452efac1465e881912f93fe4417cb255ff62324920ae73d482183d50cdbc SHA512 319d819737f6b370cd5344d4483e06781e362930610dbc4745641a208e71f753bf894693009690a6fe04bceac75ab5aa7788ae2511425cd0bd2b9229a5d0111c
-EBUILD gnome-maps-3.36.6.ebuild 1395 BLAKE2B 9fbc0e4599e1c6471f704eb742c50264a07c61e1f125c2ba48ac9c026489ff9194db57a97d9dc15e88e42555f55e1d60f66c52d1fba4969f709e15ac432d727d SHA512 abf9ea43d5a4dcb4b2549ff99b30e6f3ec243b617631c68024bf5ecc4d773ccf38fa32ab311418665f20586386b2564ac875503c2e3c4fa0e097d674c84b1e7c
-EBUILD gnome-maps-40.0.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13
-EBUILD gnome-maps-40.1.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13
+EBUILD gnome-maps-40.1.ebuild 1487 BLAKE2B 455f501a0654cdae1c74a92391c3cde774d7ea6f9ce8f208700b820d40911fe17a44e49f279a47a123f97fbc645f78cb6e28c47e691f4c0eb07fdabd39143443 SHA512 e3210f34b4ca43f83436b2ee7896be63f95e87d862d79dc7351f7003b8c3335c42f68e37848b529e57c6ed8d71db206fffa073923ce6fe66c8321ef1acb68579
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
deleted file mode 100644
index 1f388bc0f3f1..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-
-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-40.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild
deleted file mode 100644
index eb37149677c7..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-40.0.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..9} )
-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 ~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-40.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild
index eb37149677c7..0eb8aedae289 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.1.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 ~x86"
+KEYWORDS="amd64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="