gentoo auto-resync : 15:09:2022 - 23:13:44

13 files changed, 125 insertions, 632 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9a1939ebe44b..ac98de8c9079 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/endeavour/Manifest b/app-office/endeavour/Manifest
new file mode 100644
index 000000000000..be85a4067abd
--- /dev/null
+++ b/app-office/endeavour/Manifest
@@ -0,0 +1,5 @@
+AUX 42.0-build-Generate-enum-headers-first.patch 1889 BLAKE2B ce11acb08003adf6bc4cc240213f3134a0ce021a720e201ef18177097cc1953db3be0d3eb2509eeab4e9e4afc9c1f8e2246338442b5a089d3ff698a4394dc90a SHA512 3c7344205f9e71201affa162c9d9bd788054434975ac523f36330f3724628567dbcc6e04cceb199b847b58e03090a83316885af58ecd6702ce25c4cbb201e02c
+DIST Endeavour-v42.0.tar.bz2 606645 BLAKE2B f9575eeaa67f837e465cbf8e8790a477c299bea12410ceda3c1f9ab5df69948087c7c8679cee5651eac828b69fe64f2b22ff759c2174f044166b94a25270668c SHA512 6312bad832f864adc3e4e01112efccb9c867b31485460791a1d1cf0d515586e7fdb7dd9dca3790201f764b72c39cff69626794f7020b4b084034fdbd0e07d94a
+EBUILD endeavour-42.0.ebuild 1838 BLAKE2B c8cfbf404831eab92949f8d684da6c145b5dec1bfab423cc259bb35b04a92db8219229129729f2212b4495ae02fc7e21011ab98d71bebb0f1c499b60e28f894b SHA512 37bbf0eea96166febace957caf486f4da4ee0cfb9dc7cad44c0cbfeb82cb448cabedf388d82043c92e5ee64a136438a7cce61ac681716d1a7607f72ecaeb81ea
+EBUILD endeavour-9999.ebuild 1492 BLAKE2B e48f749e13ad4de817fba6ce0c7e2865adca4451e125555f4507a320112e89e91ab8e1c235772fe22cdb8c45be5383f2e12449e0bb711594d9970a1be92d86d9 SHA512 c5633a21897e5bb5e4e35679fee6e321875b084f30146847418413446419db7043719fbb946e78871e88140ced369e7c14ca1863cad432a0f8c644e8165b4614
+MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-office/gnome-todo/gnome-todo-3.28.1-r2.ebuild b/app-office/endeavour/endeavour-42.0.ebuild
index 9a33b3fd557f..cb393edc681b 100644
--- a/app-office/gnome-todo/gnome-todo-3.28.1-r2.ebuild
+++ b/app-office/endeavour/endeavour-42.0.ebuild
@@ -6,19 +6,31 @@ EAPI=8
 inherit gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="Personal task manager"
-HOMEPAGE="https://wiki.gnome.org/Apps/Todo"
+HOMEPAGE="https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/World/Endeavour.git"
+	SRC_URI=""
+else
+	SRC_URI="https://gitlab.gnome.org/World/${PN^}/-/archive/v${PV}/${PN^}-v${PV}.tar.bz2"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN^}-v${PV}"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk-doc +introspection"
+IUSE="+introspection"
+RESTRICT="test" # Tests are broken in 42.0
 
 RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=net-libs/gnome-online-accounts-3.25.3
+	>=dev-libs/glib-2.58.0:2
+	>=gui-libs/gtk-3.92.0:4[introspection?]
+	>=gui-libs/libadwaita-1.2.0:1
+	>=net-libs/gnome-online-accounts-3.25.3:=
 	>=dev-libs/libpeas-1.17
-	>=gnome-extra/evolution-data-server-3.33.1:=[gtk]
+	dev-libs/libportal:0=[gtk]
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
 	net-libs/rest:0.7
 	dev-libs/json-glib
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
@@ -27,17 +39,12 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-libs/libxml2:2
 	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
 PATCHES=(
-	"${FILESDIR}"/gnome-todo-eds-libecal-2.0.patch
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
+	"${FILESDIR}"/${PV}-build-Generate-enum-headers-first.patch
 )
 
 src_configure() {
@@ -45,17 +52,14 @@ src_configure() {
 	# TODO: should just always build introspection support as an application that needs it for full functionality?
 	# Todoist plugin requires 3.25.3 GOA for being able to add a Todoist account
 	local emesonargs=(
-		-Dbackground_plugin=true
-		-Ddark_theme_plugin=true
-		-Dscheduled_panel_plugin=true
-		-Dscore_plugin=true
-		-Dtoday_panel_plugin=true
-		-Dunscheduled_panel_plugin=true
+		$(meson_use introspection)
+		-Dtracing=false
+		-Dprofile=default
+
 		-Dtodo_txt_plugin=true
 		-Dtodoist_plugin=true
-		-Dtracing=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
+		-Dunscheduled_panel_plugin=true
+		-Dbackground_plugin=true
 	)
 	meson_src_configure
 }
diff --git a/app-office/gnome-todo/gnome-todo-9999.ebuild b/app-office/endeavour/endeavour-9999.ebuild
index 0ef934158147..97a763cfccef 100644
--- a/app-office/gnome-todo/gnome-todo-9999.ebuild
+++ b/app-office/endeavour/endeavour-9999.ebuild
@@ -6,14 +6,16 @@ EAPI=8
 inherit gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="Personal task manager"
-HOMEPAGE="https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/GNOME/gnome-todo"
+HOMEPAGE="https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gnome-todo.git"
+	EGIT_REPO_URI="https://gitlab.gnome.org/World/Endeavour.git"
 	SRC_URI=""
 else
+	SRC_URI="https://gitlab.gnome.org/World/${PN^}/-/archive/v${PV}/${PN^}-v${PV}.tar.bz2"
 	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN^}-v${PV}"
 fi
 
 LICENSE="GPL-3+"
@@ -23,13 +25,11 @@ IUSE="+introspection"
 RDEPEND="
 	>=dev-libs/glib-2.58.0:2
 	>=gui-libs/gtk-3.92.0:4[introspection?]
-	gui-libs/libadwaita:1
-	>=net-libs/gnome-online-accounts-3.25.3
+	>=gui-libs/libadwaita-1.2.0:1
+	>=net-libs/gnome-online-accounts-3.2.0:=
 	>=dev-libs/libpeas-1.17
 	dev-libs/libportal:0=[gtk]
 	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/rest:0.7
-	dev-libs/json-glib
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
 DEPEND="${RDEPEND}"
@@ -43,15 +43,10 @@ BDEPEND="
 src_configure() {
 	# TODO: There aren't any consumers of the introspection outside gnome-todo's own plugins, so maybe we
 	# TODO: should just always build introspection support as an application that needs it for full functionality?
-	# Todoist plugin requires 3.25.3 GOA for being able to add a Todoist account
 	local emesonargs=(
 		$(meson_use introspection)
 		-Dtracing=false
 		-Dprofile=default
-
-		-Dtodo_txt_plugin=true
-		-Dtodoist_plugin=true
-		-Dunscheduled_panel_plugin=true
 	)
 	meson_src_configure
 }
diff --git a/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch b/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch
new file mode 100644
index 000000000000..6efa26dead2c
--- /dev/null
+++ b/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch
@@ -0,0 +1,84 @@
+From b492285e2a4fafad887df2c4fd2a5bdb53ce39fb Mon Sep 17 00:00:00 2001
+From: Jamie Murphy <hello@itsjamie.dev>
+Date: Fri, 5 Aug 2022 18:52:20 -0700
+Subject: [PATCH] build: Generate enum headers first
+
+Fixes #380, #398, !120, !110
+---
+ src/meson.build         | 38 +++++++++++++++++++-------------------
+ src/plugins/meson.build |  3 ++-
+ 2 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index deb410a2..8f621e78 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
+ 
+ endeavour_deps += vcs_identifier_h
+ 
++#########
++# Enums #
++#########
++
++enum_headers = files(
++  join_paths('animation', 'gtd-animation-enums.h'),
++)
++
++enum_types = 'gtd-enum-types'
++
++gtd_enum_types = gnome.mkenums(
++  enum_types,
++     sources: enum_headers,
++  c_template: enum_types + '.c.template',
++  h_template: enum_types + '.h.template'
++)
++
++sources += gtd_enum_types
++
+ ###########
+ # Plugins #
+ ###########
+@@ -42,25 +61,6 @@ gtd_deps = endeavour_deps + [
+   plugins_dep,
+ ]
+ 
+-
+-#########
+-# Enums #
+-#########
+-
+-enum_headers = files(
+-  join_paths('animation', 'gtd-animation-enums.h'),
+-)
+-
+-enum_types = 'gtd-enum-types'
+-
+-sources += gnome.mkenums(
+-  enum_types,
+-     sources: enum_headers,
+-  c_template: enum_types + '.c.template',
+-  h_template: enum_types + '.h.template'
+-)
+-
+-
+ ################
+ # Header files #
+ ################
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 3d7ac4e4..2a13aff5 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -3,7 +3,8 @@ plugins_incs = [
+   include_directories('..'),
+ ]
+ 
+-plugins_sources = []
++# Ensure enum types header is generated before building plugins
++plugins_sources = [ gtd_enum_types[1] ]
+ plugins_deps = [ endeavour_deps ]
+ plugins_ldflags = []
+ plugins_libs = []
+-- 
+2.35.1
+
diff --git a/app-office/gnome-todo/metadata.xml b/app-office/endeavour/metadata.xml
index 7b343b06be8a..7b343b06be8a 100644
--- a/app-office/gnome-todo/metadata.xml
+++ b/app-office/endeavour/metadata.xml
diff --git a/app-office/gnome-todo/Manifest b/app-office/gnome-todo/Manifest
deleted file mode 100644
index 6f2d1d27ab5c..000000000000
--- a/app-office/gnome-todo/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fix-build-with-meson-0.61.patch 632 BLAKE2B 03d85c1ff1c5d6eaa180f9e299423c43bdb397d6eef14aab5ce14af825f0e2e7c037c7288ff6cd864c49db2142f964f02b605d7ef8be9c14a3f8c08fe8fc2597 SHA512 f956cbe4b26219f5c2860b4085797ae2b090a916cd9450eeb6d18be7f78434fd8bdbccdf923a4ef133d73ae0003faf6709c8f759347247ab71d23005f5be4b01
-AUX gnome-todo-eds-libecal-2.0.patch 18614 BLAKE2B 7754300bfe27317ddb5242b35f394a50a57f6d0b019dbcc7de35614f05d8a5be272f93d40b9b990bdcf912c34160caed05e99a7faa15818bffaaacebbd628ab5 SHA512 f04a34472ba2f38734086bb31a12d8493ec6ddd2bb2bc0ef2c1e9274fefa8faec51014f478d8d09bbf4bb5cafbdc1d170393b7a50ecfa22e26d5bed497a6183b
-DIST gnome-todo-3.28.1.tar.xz 751448 BLAKE2B 55c4909d35e65a763bd283e55b85dc3a6dc0190c39f3f97c33bde7c071abd8e7a88479ed72733e66bd550133bb683ed9cafb9dff36f41b4f7d6bcb9f889f2a39 SHA512 26371dd2a460656b5b7d323420cfdc3f26c548cabe0bf6a01081a017d68e062fb54164f6d0c5cf5054b59f30be65681dedde450d9b98b88f73c07131cd01f57a
-EBUILD gnome-todo-3.28.1-r2.ebuild 1673 BLAKE2B 5787853f38fd2d08deee60809dc7828a1f6558954690977087d46a57da19735dc65f2b72ac67ae9eac00f9c49143084dbb4001a464da1e16b38f0de51ed8dadf SHA512 ba5ba801a2c6241645bfe3bff0aad3ffbdfd03e9aa25f9aaa16d87e028b443024d5a6da75a155b182d7f4f0257286c68ede0958ffbcb9c2a4b69c30fb0272d28
-EBUILD gnome-todo-9999.ebuild 1568 BLAKE2B f775e13fca2945e42678a61f97687aeb42f76e808e1765735b3088419d49bbdde123222a047fd27f412d08ae229fb5b058abbbdd1b99d4de5e63fe4141f9ad0e SHA512 bebfe3d9e364f585b0d494784eb1aa442595d13dbd419bc1abca644e6f5f825352df4191eea3c9f3bf9dc4bc93afa72bc44e9e4b7d270a7a7c0f113c8f1d50b4
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch b/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch
deleted file mode 100644
index 5dabf1b9dddc..000000000000
--- a/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/832136
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata = 'org.gnome.Todo.appdata.xml'
- 
- i18n.merge_file(
--  appdata,
-   input: appdata + '.in',
-   output: appdata,
-   po_dir: po_dir,
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,7 +1,6 @@
- desktop = 'org.gnome.Todo.desktop'
- 
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: desktop + '.in',
-   output: desktop,
-@@ -13,7 +12,6 @@ i18n.merge_file(
- autostart = 'org.gnome.Todo.Autostart.desktop'
- 
- i18n.merge_file(
--  autostart,
-   type: 'desktop',
-   input: autostart + '.in',
-   output: autostart,
diff --git a/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch b/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch
deleted file mode 100644
index ddf35636352c..000000000000
--- a/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch
+++ /dev/null
@@ -1,560 +0,0 @@
-Taken from Fedora from
-https://src.fedoraproject.org/rpms/gnome-todo/raw/master/f/gnome-todo-eds-libecal-2.0.patch
-
---- a/plugins/eds/gtd-eds-autoptr.h
-+++ b/plugins/eds/gtd-eds-autoptr.h
-@@ -23,6 +23,5 @@
- #include <libecal/libecal.h>
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
---- a/plugins/eds/gtd-provider-eds.c
-+++ b/plugins/eds/gtd-provider-eds.c
-@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
- 
-   e_cal_client_create_object (client,
-                               e_cal_component_get_icalcomponent (component),
-+                              E_CAL_OPERATION_FLAG_NONE,
-                               NULL,
-                               (GAsyncReadyCallback) on_task_created_cb,
-                               new_task);
-@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
-   e_cal_client_modify_object (client,
-                               e_cal_component_get_icalcomponent (component),
-                               E_CAL_OBJ_MOD_THIS,
-+                              E_CAL_OPERATION_FLAG_NONE,
-                               NULL,
-                               (GAsyncReadyCallback) on_task_modified_cb,
-                               task);
-@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
-   gtd_object_push_loading (GTD_OBJECT (provider));
- 
-   e_cal_client_remove_object (client,
--                              id->uid,
--                              id->rid,
-+                              e_cal_component_id_get_uid (id),
-+                              e_cal_component_id_get_rid (id),
-                               E_CAL_OBJ_MOD_THIS,
-+                              E_CAL_OPERATION_FLAG_NONE,
-                               NULL,
-                               (GAsyncReadyCallback) on_task_removed_cb,
-                               provider);
---- a/plugins/eds/gtd-task-eds.c
-+++ b/plugins/eds/gtd-task-eds.c
-@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
-  */
- 
- static GDateTime*
--convert_icaltime (const icaltimetype *date)
-+convert_icaltime (const ICalTime *date)
- {
-   GDateTime *dt;
- 
-   if (!date)
-     return NULL;
- 
--  dt = g_date_time_new_utc (date->year,
--                            date->month,
--                            date->day,
--                            date->is_date ? 0 : date->hour,
--                            date->is_date ? 0 : date->minute,
--                            date->is_date ? 0 : date->second);
-+  dt = g_date_time_new_utc (i_cal_time_get_year (date),
-+                            i_cal_time_get_month (date),
-+                            i_cal_time_get_day (date),
-+                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
-+                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
-+                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
- 
-   return dt;
- }
-@@ -67,19 +67,20 @@ static void
- set_description (GtdTaskEds  *self,
-                  const gchar *description)
- {
--  ECalComponentText text;
-+  ECalComponentText *text;
-   GSList note;
- 
--  text.value = description && *description ? description : "";
--  text.altrep = NULL;
-+  text = e_cal_component_text_new (description ? description : "", NULL);
- 
--  note.data = &text;
-+  note.data = text;
-   note.next = NULL;
- 
-   g_clear_pointer (&self->description, g_free);
-   self->description = g_strdup (description);
- 
--  e_cal_component_set_description_list (self->component, &note);
-+  e_cal_component_set_descriptions (self->component, (description && *description) ? &note : NULL);
-+
-+  e_cal_component_text_free (text);
- }
- 
- static void
-@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
-   GSList *l;
- 
-   /* concatenates the multiple descriptions a task may have */
--  e_cal_component_get_description_list (self->component, &text_list);
-+  text_list = e_cal_component_get_descriptions (self->component);
- 
-   for (l = text_list; l != NULL; l = l->next)
-     {
-@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
-             {
-               carrier = g_strconcat (desc,
-                                      "\n",
--                                     text->value,
-+                                     e_cal_component_text_get_value (text),
-                                      NULL);
-               g_free (desc);
-               desc = carrier;
-             }
-           else
-             {
--              desc = g_strdup (text->value);
-+              desc = g_strdup (e_cal_component_text_get_value (text));
-             }
-         }
-     }
- 
-   set_description (self, desc);
- 
--  e_cal_component_free_text_list (text_list);
-+  g_slist_free_full (text_list, e_cal_component_text_free);
- }
- 
- 
-@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
-   self = GTD_TASK_EDS (object);
- 
-   if (self->component)
--    e_cal_component_get_uid (self->component, &uid);
-+    uid = e_cal_component_get_uid (self->component);
-   else
-     uid = NULL;
- 
-@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject   *object,
-   if (!self->component)
-     return;
- 
--  e_cal_component_get_uid (self->component, &current_uid);
-+  current_uid = e_cal_component_get_uid (self->component);
- 
-   if (g_strcmp0 (current_uid, uid) != 0)
-     {
-@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject   *object,
- static gboolean
- gtd_task_eds_get_complete (GtdTask *task)
- {
--  icalproperty_status status;
-+  ICalPropertyStatus status;
-   GtdTaskEds *self;
-   gboolean completed;
- 
-@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
- 
-   self = GTD_TASK_EDS (task);
- 
--  e_cal_component_get_status (self->component, &status);
--  completed = status == ICAL_STATUS_COMPLETED;
-+  status = e_cal_component_get_status (self->component);
-+  completed = status == I_CAL_STATUS_COMPLETED;
- 
-   return completed;
- }
-@@ -195,8 +196,8 @@ static void
- gtd_task_eds_set_complete (GtdTask  *task,
-                            gboolean  complete)
- {
--  icalproperty_status status;
--  icaltimetype *dt;
-+  ICalPropertyStatus status;
-+  ICalTime *dt;
-   GtdTaskEds *self;
-   gint percent;
- 
-@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask  *task,
-       percent = 100;
-       status = ICAL_STATUS_COMPLETED;
- 
--      dt = g_new0 (icaltimetype, 1);
--      dt->year = g_date_time_get_year (now);
--      dt->month = g_date_time_get_month (now);
--      dt->day = g_date_time_get_day_of_month (now);
--      dt->hour = g_date_time_get_hour (now);
--      dt->minute = g_date_time_get_minute (now);
--      dt->second = g_date_time_get_seconds (now);
--      dt->zone = icaltimezone_get_utc_timezone ();
-+      dt = i_cal_time_new_null_time ();
-+      i_cal_time_set_date (dt,
-+                           g_date_time_get_year (now),
-+                           g_date_time_get_month (now),
-+                           g_date_time_get_day_of_month (now));
-+      i_cal_time_set_time (dt,
-+                           g_date_time_get_hour (now),
-+                           g_date_time_get_minute (now),
-+                           g_date_time_get_seconds (now));
-+      i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
- 
-       /* convert timezone
-        *
-        * FIXME: This does not do anything until we have an ical
-        * timezone associated with the task
-        */
--      icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
-+      i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
-     }
-   else
-     {
-       dt = NULL;
-       percent = 0;
--      status = ICAL_STATUS_NEEDSACTION;
-+      status = I_CAL_STATUS_NEEDSACTION;
-     }
- 
--  e_cal_component_set_percent_as_int (self->component, percent);
-+  e_cal_component_set_percent_complete (self->component, percent);
-   e_cal_component_set_status (self->component, status);
-   e_cal_component_set_completed (self->component, dt);
- 
--  if (dt)
--    e_cal_component_free_icaltimetype (dt);
-+  g_clear_object (&dt);
- }
- 
- static GDateTime*
- gtd_task_eds_get_creation_date (GtdTask *task)
- {
--  icaltimetype *idt;
-+  ICalTime *idt;
-   GtdTaskEds *self;
-   GDateTime *dt;
- 
-   self = GTD_TASK_EDS (task);
--  idt = NULL;
-   dt = NULL;
- 
--  e_cal_component_get_created (self->component, &idt);
-+  idt = e_cal_component_get_created (self->component);
- 
-   if (idt)
-     dt = convert_icaltime (idt);
- 
--  g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
-+  g_clear_object (&idt);
- 
-   return dt;
- }
-@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask     *task,
- static GDateTime*
- gtd_task_eds_get_due_date (GtdTask *task)
- {
--  ECalComponentDateTime comp_dt;
-+  ECalComponentDateTime *comp_dt;
-   GtdTaskEds *self;
-   GDateTime *date;
- 
-@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
- 
-   self = GTD_TASK_EDS (task);
- 
--  e_cal_component_get_due (self->component, &comp_dt);
-+  comp_dt = e_cal_component_get_due (self->component);
-+  if (!comp_dt)
-+    return NULL;
- 
--  date = convert_icaltime (comp_dt.value);
--  e_cal_component_free_datetime (&comp_dt);
-+  date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
-+  e_cal_component_datetime_free (comp_dt);
- 
-   return date;
- }
-@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask   *task,
- 
-   if (dt != current_dt)
-     {
--      ECalComponentDateTime comp_dt;
--      icaltimetype *idt;
-+      ECalComponentDateTime *comp_dt;
-+      ICalTime *idt;
- 
--      comp_dt.value = NULL;
--      comp_dt.tzid = NULL;
-+      comp_dt = NULL;
-       idt = NULL;
- 
-       if (!current_dt ||
-@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask   *task,
-            dt &&
-            g_date_time_compare (current_dt, dt) != 0))
-         {
--          idt = g_new0 (icaltimetype, 1);
-+          idt = i_cal_time_new_null_time ();
- 
-           g_date_time_ref (dt);
- 
-           /* Copy the given dt */
--          idt->year = g_date_time_get_year (dt);
--          idt->month = g_date_time_get_month (dt);
--          idt->day = g_date_time_get_day_of_month (dt);
--          idt->hour = g_date_time_get_hour (dt);
--          idt->minute = g_date_time_get_minute (dt);
--          idt->second = g_date_time_get_seconds (dt);
--          idt->is_date = (idt->hour == 0 &&
--                          idt->minute == 0 &&
--                          idt->second == 0);
--
--          comp_dt.tzid = g_strdup ("UTC");
-+          i_cal_time_set_date (idt,
-+                               g_date_time_get_year (dt),
-+                               g_date_time_get_month (dt),
-+                               g_date_time_get_day_of_month (dt));
-+          i_cal_time_set_time (idt,
-+                               g_date_time_get_hour (dt),
-+                               g_date_time_get_minute (dt),
-+                               g_date_time_get_seconds (dt));
-+          i_cal_time_set_is_date (idt,
-+                          i_cal_time_get_hour (idt) == 0 &&
-+                          i_cal_time_get_minute (idt) == 0 &&
-+                          i_cal_time_get_second (idt) == 0);
- 
--          comp_dt.value = idt;
-+          comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
- 
--          e_cal_component_set_due (self->component, &comp_dt);
-+          e_cal_component_set_due (self->component, comp_dt);
- 
--          e_cal_component_free_datetime (&comp_dt);
-+          e_cal_component_datetime_free (comp_dt);
- 
-           g_date_time_unref (dt);
-         }
-       else if (!dt)
-         {
--          idt = NULL;
--          comp_dt.tzid = NULL;
--
-           e_cal_component_set_due (self->component, NULL);
-         }
-     }
-@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask   *task,
- static gint32
- gtd_task_eds_get_priority (GtdTask *task)
- {
--  g_autofree gint *priority = NULL;
-   GtdTaskEds *self;
- 
-   g_assert (GTD_IS_TASK_EDS (task));
- 
-   self = GTD_TASK_EDS (task);
- 
--  e_cal_component_get_priority (self->component, &priority);
--
--  if (!priority)
--    return -1;
--
--  return *priority;
-+  return e_cal_component_get_priority (self->component);
- }
- 
- static void
-@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
- 
-   self = GTD_TASK_EDS (task);
- 
--  e_cal_component_set_priority (self->component, &priority);
-+  e_cal_component_set_priority (self->component, priority);
- }
- 
- static const gchar*
- gtd_task_eds_get_title (GtdTask *task)
- {
--  ECalComponentText summary;
-   GtdTaskEds *self;
- 
-   g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
- 
-   self = GTD_TASK_EDS (task);
- 
--  e_cal_component_get_summary (self->component, &summary);
--
--  return summary.value;
-+  return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
- }
- 
- static void
- gtd_task_eds_set_title (GtdTask     *task,
-                         const gchar *title)
- {
--  ECalComponentText new_summary;
-+  ECalComponentText *new_summary;
-   GtdTaskEds *self;
- 
-   g_return_if_fail (GTD_IS_TASK_EDS (task));
-@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask     *task,
- 
-   self = GTD_TASK_EDS (task);
- 
--  new_summary.value = title;
--  new_summary.altrep = NULL;
-+  new_summary = e_cal_component_text_new (title, NULL);
- 
--  e_cal_component_set_summary (self->component, &new_summary);
-+  e_cal_component_set_summary (self->component, new_summary);
-+
-+  e_cal_component_text_free (new_summary);
- }
- 
- 
-@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
-                             GtdTask *subtask)
- {
-   g_autoptr (GList) subtasks = NULL;
--  ECalComponentId *id;
-+  const gchar *uid;
-   ECalComponent *comp;
--  icalcomponent *ical_comp;
--  icalproperty *property;
-+  ICalComponent *ical_comp;
-+  ICalProperty *property;
-   GtdTaskEds *subtask_self;
-   GtdTaskEds *self;
- 
-@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
-   /* Hook with parent's :subtask_added */
-   GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
- 
--  id = e_cal_component_get_id (self->component);
-+  uid = e_cal_component_get_uid (self->component);
-   comp = subtask_self->component;
-   ical_comp = e_cal_component_get_icalcomponent (comp);
--  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
- 
-   if (property)
--    icalproperty_set_relatedto (property, id->uid);
-+    i_cal_property_set_relatedto (property, uid);
-   else
--    icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
-+    i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
- 
--  e_cal_component_free_id (id);
-+  g_clear_object (&property);
- }
- 
- static void
-@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
-                               GtdTask *subtask)
- {
-   g_autoptr (GList) subtasks = NULL;
--  icalcomponent *ical_comp;
--  icalproperty *property;
-+  ICalComponent *ical_comp;
-+  ICalProperty *property;
-   GtdTaskEds *subtask_self;
- 
-   subtask_self = GTD_TASK_EDS (subtask);
-@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
- 
-   /* Remove the parent link from the subtask's component */
-   ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
--  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
- 
-   if (!property)
-     return;
- 
--  icalcomponent_remove_property (ical_comp, property);
-+  i_cal_component_remove_property (ical_comp, property);
-+  g_object_unref (property);
- }
- 
- 
---- a/plugins/eds/gtd-task-list-eds.c
-+++ b/plugins/eds/gtd-task-list-eds.c
-@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
-                    GtdTask        *task)
- {
-   ECalComponent *component;
--  icalcomponent *ical_comp;
--  icalproperty *property;
-+  ICalComponent *ical_comp;
-+  ICalProperty *property;
-   GtdTask *parent_task;
-   const gchar *parent_uid;
- 
-   component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
-   ical_comp = e_cal_component_get_icalcomponent (component);
--  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
-+  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
- 
-   if (!property)
-     return;
- 
--  parent_uid = icalproperty_get_relatedto (property);
-+  parent_uid = i_cal_property_get_relatedto (property);
-   parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
- 
-   if (parent_task)
-@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
- 
-       g_ptr_array_add (self->pending_subtasks, data);
-     }
-+
-+  g_object_unref (property);
- }
- 
- static void
-@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
-       GtdTask *task;
-       const gchar *uid;
- 
--      component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
--      e_cal_component_get_uid (component, &uid);
-+      component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+      uid = e_cal_component_get_uid (component);
- 
-       task = gtd_task_list_get_task_by_id (self, uid);
- 
-@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
-       GtdTask *task;
-       const gchar *uid;
- 
--      component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
--      e_cal_component_get_uid (component, &uid);
-+      component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
-+      uid = e_cal_component_get_uid (component);
- 
-       task = gtd_task_list_get_task_by_id (self, uid);
- 
-@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
-       GtdTask *task;
- 
-       id = l->data;
--      task = gtd_task_list_get_task_by_id (self, id->uid);
-+      task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
- 
-       if (!task)
-         continue;
---- a/plugins/eds/meson.build
-+++ b/plugins/eds/meson.build
-@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
- ################
- 
- eds_plugin_deps = [
--  dependency('libecal-1.2', version: '>= 3.13.90'),
-+  dependency('libecal-2.0', version: '>= 3.33.1'),
-   dependency('libedataserver-1.2', version: '>= 3.17.1'),
-   dependency('libedataserverui-1.2', version: '>= 3.17.1'),
--  dependency('libical', version: '>= 0.43'),
- ]
- 
- eds_plugin_deps += gnome_todo_deps
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 501e895862c7..17c042479d84 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -549,6 +549,6 @@ DIST LibreOffice_7.3.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1091848 BLAKE2B
 DIST LibreOffice_7.3.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 1111553 BLAKE2B c9b116227098520e577af505ee319171aed7ce0bd5710c6292764440acbfdb882b6c9b384730ca4ce32c8d7dabf14a6a5f0688c628d290fd0e40ba97990b9382 SHA512 2c2eeffbee6ab71ee9b49ebd3261cff1db5c13d9a24bbe0fc0cf31829aa55935b2cf68e051595acbb5253c9a90e6dd8933437b2223c676ae21cfd0db7dc74341
 DIST LibreOffice_7.3.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz 317733 BLAKE2B b421c7005a6a9fad0bee7d02ba63013e8bcf853e72f59588f078d1b42234f08da65b687d6b2805de8ae86f3d815986a7d5cc0adadb2b018c3f3703815a47234b SHA512 35f188a2a61dfe329f27b594ca4853ac3b093e9631059954f2dde4ca319c03c62e1e94b0ff7f142074c9394c87a1b7cc6c556245c5d6a65d06052c7703677afc
 EBUILD libreoffice-l10n-7.3.4.2.ebuild 3685 BLAKE2B 5e71a8974f751af51cd692693483b86bdff5eefea0b10bdb9351324b6432f4f0a76b3c9086c2c64a99644c0aba001806a39910ac682fc89638ada957a3c50a51 SHA512 3b23bb01971c4371a61e55334b02cddfa9219cbed33ace17e991b6f7e217165a9f2938f637b639ed74a44750a3799d6471142265796a75399a1b39f31f1789cd
-EBUILD libreoffice-l10n-7.3.5.2.ebuild 3695 BLAKE2B c1ddcd00e589eb457ff443ea9d9328e24dc8966f9317009a824a242065f3315010dd1eea166c9dd19c9cb74a67327ab346d136312db8dc43554480371298d913 SHA512 957b39473bbbd87025c4c8ca939ab06e309c6517804cd2b495623dc6cb65baa93d185ccaef0955a2b00c9fcc0e18b16116002262f2a2e63f0ac71b6221d1d280
+EBUILD libreoffice-l10n-7.3.5.2.ebuild 3694 BLAKE2B 7d34beeb7ff32eb7460c87e1146f5da772c4a7a6a9f0433aa6e972ba08b2eef2fa1fc75a76375e62823d656288c07ee98effc31b77a0fd488f63c5ec3d3a4f40 SHA512 541d94f6a2efb14ea907c628056660b678ae17d52e5d52ae926641eb969503167099c9a09ce58961af1d8cf09f572b9d8b4a52d15b8d96cb214571feabcb35b2
 EBUILD libreoffice-l10n-7.3.6.2.ebuild 3695 BLAKE2B c1ddcd00e589eb457ff443ea9d9328e24dc8966f9317009a824a242065f3315010dd1eea166c9dd19c9cb74a67327ab346d136312db8dc43554480371298d913 SHA512 957b39473bbbd87025c4c8ca939ab06e309c6517804cd2b495623dc6cb65baa93d185ccaef0955a2b00c9fcc0e18b16116002262f2a2e63f0ac71b6221d1d280
 MISC metadata.xml 370 BLAKE2B 19bdb15f0dd1c100e450d6bcbb07dd79b6debb6d278d0bf08cc668b916c3fdef1431256aaf184997c95556ecff6da5811d1a1cd89b6e4beeae7b55116c5739cf SHA512 e39c0062d9f3a4845d86539861c1b2caffb5c44c4334449b6bc97f23bf134df100c06d244a25a34f625db318f7607210ecf3c9d7ae3d3ce5444ad685717969a1
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.5.2.ebuild
index 25c4e25fcb19..6fd4674fc3fa 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.5.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.5.2.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f46af60bb248..527d9c53e9dc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -39,7 +39,7 @@ DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.4.2-r1.ebuild 19835 BLAKE2B bb4a593ba75bebe98adaea510a98ca2093048fc070e0c79947dc8bbf32732507cb0c5a16c1195ef235f88e971c8c83c8ef64792134a2e73dfde976c314ca2b82 SHA512 365d369e5850f762854de4529c4ab6b6d8b75ff94589406ffe5c63ba93462473a23a69ed44d76212fc1ab7479b2c775ea48dd217cb12298a140dd7ebbff2569c
-EBUILD libreoffice-7.3.5.2.ebuild 19550 BLAKE2B 5d5965d89eb5264de50f83eb9bbc8a555da52386a7a8845a5a286a9b195133c6abbedcee29c88361774f84a90122349414bef49cb8bd677282b28c6204b335c2 SHA512 1ef0259963f736dfebe658cc15f0cb81e6385dc25b3e170a7fc7d2d0f9f0907db0e9e28ec6774c7ae3c444d8e78f6029691f90fb0884e1f51a5460c75812bcdf
+EBUILD libreoffice-7.3.5.2.ebuild 19549 BLAKE2B ec09e54cbb158d585b5406b831adc1242726b6d166ec1c2c0e293f6150fff41cbcd2b3669d594e6156e95ee1cc0917e84a879e0b2cad1ac576828913b4f3bdec SHA512 78c3e4f90739ba53794b2aed090feff54b3e93e19f9af96507f7226643525b01ee83e069689544cc2bea18e212cf10a0ac7a7e7bad5230809a8c38ba55990346
 EBUILD libreoffice-7.3.6.2.ebuild 19559 BLAKE2B b7c4db09cb813ab554bf5a54401d49a7a8b99ed9c153eb7fb8ac5dd06d8540b805d3ee64621cbb3cd1e657dbefcdaa0159be724c8bcd72d13bf6025462e1921e SHA512 2f9d565221dd32d810259a0737dc433a3eb1001282620adc4eaf0e35fe031d7fa4c170a816f2dc46a13def7105a166509541a2dd93d4e4dcd0113bb799f7976b
 EBUILD libreoffice-7.3.9999.ebuild 19559 BLAKE2B b7c4db09cb813ab554bf5a54401d49a7a8b99ed9c153eb7fb8ac5dd06d8540b805d3ee64621cbb3cd1e657dbefcdaa0159be724c8bcd72d13bf6025462e1921e SHA512 2f9d565221dd32d810259a0737dc433a3eb1001282620adc4eaf0e35fe031d7fa4c170a816f2dc46a13def7105a166509541a2dd93d4e4dcd0113bb799f7976b
 EBUILD libreoffice-9999.ebuild 19400 BLAKE2B 6b745f505e0cf7dfbeae5ee37040bc2df0a68535b73bd536bd88f0ebc5284551d5fb9eacbd0eea8019a2a3cb25351953f56767376b06a361b32b1d6d9bb25e0b SHA512 efc0bd853b153f410a91aa6331e91fddb38dc7f56fc9a1a7047ec340c580508cc91e5a5f50e41ab441656dff0e86dbb74a72d8b18fbdbc177c318f1f85f75fb1
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index bbd10983c691..b266ff614f53 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip