gentoo resync : 29.12.2022

5 files changed, 4 insertions, 82 deletions

diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 66fcf2229899..c424bf9b1cf6 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-calendar-40.2-meson-0.61.patch 708 BLAKE2B 65a37339599bd0303adc9126eb3246b8b84956a52814c671b14484f9fddc4198533e6a06c536aed98384b4b832b462966f3079c1c8ec3d0f893c1835c0e27bde SHA512 fe89025d23bf9a08df7352891a841729f5350817c73803da96c450f7cf46d5ec0c4e436336de3666d61a1e61bc0a781480ec1b4bfc2db5c76e2234eed40c467f
-DIST gnome-calendar-41.2.tar.xz 583584 BLAKE2B ef21836ef87ba19de0c25f5cb73631b73a60352ca97db88dabbc1632097d3ef7e12c257fe946f7d92466f232248e1b27891394b44d73d61a3336521b2bb5d883 SHA512 1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb
-DIST gnome-calendar-42.0.tar.xz 579044 BLAKE2B ab6b7f10b234b277364dcee95aec7b616a0ffc8049d949545972a74805ee0953b8e04a75933c9a5bb29e5e67855142fc712a1d453843d15cdf4cdedb373029f8 SHA512 3a0950683bb0c5b57bd8fca3d49815bf1bf05005a075e50e8f4a61e6a5bc0f875230a89033bfd4945ed5550253ab4686788a1e2239eff4f76f58716b86cf6fbe
 DIST gnome-calendar-42.1.tar.xz 578424 BLAKE2B a9c62093eb89e198bec801aa070d9e2afed87833dce85a55775d4938cda23fc7dd166b9739e208e17d40b82e7dfcf0e76c83c09eb07786f9d79c38fed910d616 SHA512 5f50ab84f98c3ddf4c1e49f9556e47f6590c5eb8a3b598edb76d96d5c8eab48003e957d5b199a94a3955951453e3c3b783745c9b9376aee2d93d14ff95178093
-EBUILD gnome-calendar-41.2.ebuild 1218 BLAKE2B bc4e3fa9635ef8460c292e806a7ceb8658a5a32aec240b0ec574461756682a16475c4fc5993ae7c09fd199f515bd4a27a9b534e4eb82110379ca80a63276922c SHA512 a740044bcc16abf72ee2c52b43cd63c1cb8099ff32d0bacb8708b7961e2da3058659af65d63376c12aedd6dfc165d732bfbc945b42ce87edddd57a3df9293663
-EBUILD gnome-calendar-42.0.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
-EBUILD gnome-calendar-42.1.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
+DIST gnome-calendar-42.2.tar.xz 578276 BLAKE2B 44684f7c1b6db6865bf0b9bc7096a990212b086d7c2e748cb41e4ac6ced4a1bec0e14f5ed3d6253f49006f4e736666578ded9cd6cd84533fcc03316c5a437b4d SHA512 6ab72017dc0230dc396c7c19cdeab633744b6a44ac4a5c2183389cadca1507bf696c5cdf39def1c0158fb0be5f1988f2a30a6fc2ea0090d6fc341adc45daddbe
+EBUILD gnome-calendar-42.1.ebuild 1093 BLAKE2B eaa1a3b269addf90f7b23c35586ed606b08811fa24dd0b303e88ff40871fada4d72357e2025acf52da8eda9e2eb6ffcbbc0ac777d37f4dd4b54d6e1fc1d8b6df SHA512 30409e17f23f833624e318cba0881268034f37cafe6c76ad6187df4185b02aeacb12cee6b654b53f735743c4df3aaf8a6a236912cc8bc00701d7af2366191343
+EBUILD gnome-calendar-42.2.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
deleted file mode 100644
index ec5dc0fc6fca..000000000000
--- a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198.patch
-https://bugs.gentoo.org/831926
-
-From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 21:18:39 +0100
-Subject: [PATCH] meson.build: fix meson 0.61 builds
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
- appdata = i18n.merge_file(
--  'appdata',
-   input: configure_file(
-     input: files('org.gnome.Calendar.appdata.xml.in.in'),
-     output: 'org.gnome.Calendar.appdata.xml.in',
-GitLab
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
deleted file mode 100644
index d9ffb9a87b0c..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.33.1
-	>=gui-libs/libhandy-1.0.0:1=
-	>=dev-libs/glib-2.67.5:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-40.0:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
-)
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
index 4a5ef1c8dce0..ed7f77824527 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
 DEPEND="
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild
index 4a5ef1c8dce0..4a5ef1c8dce0 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-42.0.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild