gentoo resync : 02.02.2022

6 files changed, 33 insertions, 110 deletions

diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 29f193cc4c41..5a17b569bb54 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,9 +1,6 @@
+AUX gnome-calendar-40.2-meson-0.61.patch 708 BLAKE2B 65a37339599bd0303adc9126eb3246b8b84956a52814c671b14484f9fddc4198533e6a06c536aed98384b4b832b462966f3079c1c8ec3d0f893c1835c0e27bde SHA512 fe89025d23bf9a08df7352891a841729f5350817c73803da96c450f7cf46d5ec0c4e436336de3666d61a1e61bc0a781480ec1b4bfc2db5c76e2234eed40c467f
 DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
-DIST gnome-calendar-41.0.tar.xz 576612 BLAKE2B b9544e9402edb25fae5b0598621116ac6c3215b2092675ef48b1b686cceebc43422a54b963ad6639b104833e6c07b58e57d86c5c514b7c025da0374d915a13ac SHA512 ba57af23f967a0900fd64399d9358c2dd131be86120e01d68cd4eee436e8a0bac6f4a3b154ffcfbb2d307ae632cfed7de29f79f843e4692cc1a81a82dadc5e4a
-DIST gnome-calendar-41.1.tar.xz 582736 BLAKE2B bccb63eeb4092d5e451cb5e20858ef63c0b79bd381dc0b2982882b716e216e6195fed3cfe418ba191996c21db9048d7cf5d0b29ee92787a3e92558a4f052cd82 SHA512 c17ea429acbaf377036310bb42856f66632f712397a8e38279e7c537d6b4545a48935ada33d4169fd687022ad39ec73a2022b3e2f66c38325e60d45dfe41fcc6
 DIST gnome-calendar-41.2.tar.xz 583584 BLAKE2B ef21836ef87ba19de0c25f5cb73631b73a60352ca97db88dabbc1632097d3ef7e12c257fe946f7d92466f232248e1b27891394b44d73d61a3336521b2bb5d883 SHA512 1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb
-EBUILD gnome-calendar-40.2.ebuild 1156 BLAKE2B a47dc8bdc46a5ff301f19df1b29b0cd80f197920a5bde87e533062c727b6fef02b6068f5f2621cce7e9ba6296e48e86edb3d3ca3ac9d3227112fae891ac5d267 SHA512 a87ec1383bcdb7a2be0f4e5bb06d6dc341731a6a55ba005cf270eb46f08a81beea2c85641d8df75370d963a4842b5a36b301c663842e0ada22dae72ceca50b31
-EBUILD gnome-calendar-41.0.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
-EBUILD gnome-calendar-41.1.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
-EBUILD gnome-calendar-41.2.ebuild 1165 BLAKE2B 0718030bbfdf731de10a5c860c944b2f0fcbddf76501495ebde1b82fd8f047d643d5ff070c8d3a14f86264e6529c62fd256766014b809fc5b44026e506b3485d SHA512 482f2ee157eb7ae21ae14426c3019b59574846cc5bfead8cdececd1940164b2cafa9989831567f2c799689e2ec869db51f74f98845ad2e2083668d617827a820
+EBUILD gnome-calendar-40.2.ebuild 1212 BLAKE2B 8644d6e5ea9f732b9e2d661c9dd84624f7ef18881f84738f99926661c0b456c3f2134316aed5d3d507648e0941759f9feb640d141a218b497d40c70f49ff297c SHA512 668bf8a755ae6289a9f32f4c90d2e952237827740c4c7f8180978f9fa9fbbcd38f6b8208edae6a90ba38072050b4ae4acc8db0b72797a0831bb7df20070a2d8a
+EBUILD gnome-calendar-41.2.ebuild 1221 BLAKE2B 132f88ffbfa724f267293361afe2b3a4f8687c637dbf1bc2bc10541d107275c23bd1556b95df02d9e9e1ce112ba020d66b83f9555ac9ef39482ecf3956b29500 SHA512 c4c1a868e859dff2899ddee5db9c528c39c5f6c2777d8abeddcf5660890160ff7f9b57ec36ff712969a4c5ed2b9e6d2674f8197ea0df515558dd729c4e79db59
 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
new file mode 100644
index 000000000000..ec5dc0fc6fca
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
@@ -0,0 +1,20 @@
+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-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
index e0432410aee0..b011342f854b 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.2.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
@@ -36,6 +36,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
+)
+
 src_test() {
 	virtx meson_src_test
 }
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild
deleted file mode 100644
index ac5e1d4c4c46..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild
+++ /dev/null
@@ -1,51 +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 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 ~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
-"
-
-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-41.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.1.ebuild
deleted file mode 100644
index ac5e1d4c4c46..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.1.ebuild
+++ /dev/null
@@ -1,51 +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 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 ~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
-"
-
-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-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
index 4ccb6627d062..7045bd688f26 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.2.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
@@ -36,6 +36,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.2-meson-0.61.patch
+)
+
 src_test() {
 	virtx meson_src_test
 }