gentoo auto-resync : 07:04:2024 - 00:30:43

9 files changed, 3 insertions, 627 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d3c278cee0b9..f8657f3473dd 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 8865ff96fe29..70d09b890d57 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,15 +1,7 @@
-AUX 0001-meson.build-allow-linux-to-build-without-flatpak-ins.patch 1270 BLAKE2B 892318bc64ec5ff4eb1f4fe0b2d2e718dd278d59e3e1d2a67746fdcd60c3e74723e8696b73ab4c4436f2aa63e945cc03e6abfbb367ab39edcb7a11a703d57441 SHA512 2cff5d7feaf2c3eac46779105104160ec2b19a2330afd4366d54a6dce77366b72322b1896d711e462495fd79d56b4d9df0f389c6f29dc7a72447b2b2214c71b7
-AUX 0002-meson.build-allow-linux-to-build-without-bubblewrap.patch 1150 BLAKE2B b1dc54021e05b35e9a6478e0ed94e46498288d39901c98ce711cb3942a8cdaecde5c0d6d83cf275bf18960d7e8a74fca1c34375f3690f7a3fe9315ae575f707f SHA512 c7c751725b7a8bdb4151447822df33057c15e1406b2b524a7e3f5b16f71ff7492b2ba5687c111f3c6196a972753c6f46e2a401c9ed3ba015ed61168fd865f16a
-AUX 0003-Make-flatpak-bwrap-optional.patch 1993 BLAKE2B 967cfbf0936cd612a227935ecfe297d1df654c08fb0da3c6b344f7687d4bcbc43aca34e3b3b96318e4da13769b6286776996a67d35558a5152b67ef89e291dcc SHA512 ed6d0f5829a58b7ce7c665a564e14778e7302fa486251befa827f653abcf7b05a75cf71897029e293dc0c6561c902420ff62cd12e00082b634132f04d9a75584
 AUX default-portals.conf 22 BLAKE2B 06a584551d11a4b2d51bf236eb657cda2360e8b324574a936c9d6f03a2d4c041ce72b6cc8a00740e4773ce654ad1867a818215c1bf610007a9dcd4b7b6b65149 SHA512 29af734e44797d4812165fa7d0be36b9047b1b9cfa12aad3628bb95ee3dbb9ff4efbd8023fb43a63d01c7e8879d58c6634710b47416929d3a7a5ca376ae18451
-AUX xdg-desktop-portal-1.16.0-delay-open-fix.patch 14123 BLAKE2B 92ad185c8ef9155b3285614a230b83bbd97d741772a51e27ee026c606ca9893dd5bdb8cf3882334e0f6abb687e819df0c08cd3d0aa144a72b37ad6da778f41ef SHA512 5d36d0259bea8d40f112861044fd8f8da77aec5144b3518d5c8d77b3cc2c86a84473a34e3c20a873d72427ad5caf02a97a1282a880cfcea620eab9fac18d39fc
 AUX xdg-desktop-portal-1.18.0-sandbox-disable-failing-tests.patch 2444 BLAKE2B a93b089a7bbd23b258d28711a144982b9c102f7d0001b10a80d1f378da6965f7547ce11c4bfee8e534aa23b573b600d6a40d22877d6d9ddbe81f89d46dc73373 SHA512 99f87d9ed61cdf63af2449c1e2d2f3472db4fd21fa2baec7403bee6460146183a84af01ec18b13c1c072e5a7dd68b2e07a47b0e0886e4dffa09bf788d92ab5ec
-DIST xdg-desktop-portal-1.16.0.tar.xz 250524 BLAKE2B 9d5bd760621b114a19c1cc8895f91c43fcfed0dd067ba9678de0f11dc7835ec29c4a2c452274adbd36ee1318359caa8d7ca0c585558eb73a2a4e53528e6b02da SHA512 f7e7e96d3a6757901fbc4c0310aac0afbf37882c279a2859e06f63528049cd9b50dd2d55445d1386f03f62557c1a2ec81d4ee081200367d6269d2dffc75f0912
-DIST xdg-desktop-portal-1.18.0.tar.xz 260788 BLAKE2B 3a7575af17a5b21d6f313a098a9144df9d6f24768c6e16e4fb45382fac3c64aab3b361b29226769c8cc979c278ec61469f32841792bb0f4e7d9e83fc1fab40fc SHA512 416c0736342b2909c10db025da72edca6d106b46224341bdf45ab41152c01b97f4a4eb78df924a6fbc771475bf103c1aea3005d8ff683f1eca935dbd1afe4a51
-DIST xdg-desktop-portal-1.18.1.tar.xz 696988 BLAKE2B b458b50b7adf2ad3cf47f86f01d4323ca5110bd07c76eb19b789445f1bab1662ae031f3c99d171f41d1db87f262c28e1ed810527612f7b1cec521a21d690088f SHA512 b4340d14a94a03bdf3ebee8d5a13e7d9386e870b50654369293670d5a828fd258fe419b330c036eaa28963447764db2169aa7f225819a4f9877e57d18c59030e
 DIST xdg-desktop-portal-1.18.2.tar.xz 698912 BLAKE2B c8b0da07c094627c36b72b775367ec9081d7e710c0c29640afc239c2048e686611ae0ab941515337605c175ad63345e8ffdcd4982ad0997d5ca67fc31e289f89 SHA512 937fea3dfa0ab4b99146fbf5e4e42fdd94a22ab204f45395257c562e97803e71a777ca17faa5077205a1dd6b7d86291dfeed75922e311a61a402ebf4e05cfa19
-EBUILD xdg-desktop-portal-1.16.0-r1.ebuild 1810 BLAKE2B df6be02fd06693018cd95e4bc76cde9aa852bac499febac04c8775a8df78875dc7463bdd509f7c4df1f7be46fb9116bf7c24a0ab10a5a7baf10278ec8a46642c SHA512 7a776e3a8b9614519408e23436c05ca18f4430090c0b8f8a5c0acd89469b56215767e191e712ac1cf11618f9ae23ea9fd9b13a6b6157119fc8dbe427ba2ce214
-EBUILD xdg-desktop-portal-1.18.0-r2.ebuild 3638 BLAKE2B 5ff3045e414fe3f8fcea6156ba80a22344cf045d2448850609bccb38848ea9789a563cce507fb9a591cda2b21741391459fd1b3ca26a9c440aaef7df1fd7ce9e SHA512 35cc49eca5788b14700d133757c2be75cf82785cad54b24062b44067af7792426bb3dd82ed9e2009e9a0673d2b3c4b9be8c608076c1e40032088eddc8fab3f7d
-EBUILD xdg-desktop-portal-1.18.1.ebuild 3411 BLAKE2B 538ae8d4fe5b2abb07640dcb063942b5640750bf7f5966fe66b77c737d925297e83d415e7bffbc06d4845119635f81348af6aaf739a8fb91c295f265a002ba59 SHA512 fe38bd3b836dada0b9bc97de9b31566b697a574f2de2f365cfd0ff8914347cbbe45a217687fd27c679a8838094ca7cccad2331380486feceeec9ad3fc1c4ead2
+DIST xdg-desktop-portal-1.18.3.tar.xz 699168 BLAKE2B 495deda38f20c384b80db25f11010a67ed9b26d8577e23e16221d54e9eb0edd5f4b1fac633e70eefc4bf1a689c0cdbbb5b524aff219c020e8ef227397eff4802 SHA512 aada58ac8ad5e15b509a3435b350f898b12e4638e09b1fd2f517e641e67991d5ae22ca32e0f2f0edfa902a4e1515a36b367b84040e95d27ef0b5b8092b768f55
 EBUILD xdg-desktop-portal-1.18.2.ebuild 3408 BLAKE2B fad9fd0ad7fe52f3544fdba3d342b48a56c651923a41d161253aa89c62fffb9f0073f20e9215cc49af274547a97e97263408bfde2eb9c2ef0386d630e5f70275 SHA512 cde3e91a13d7a80071597015ccd7635cc245658cd968234c36375dd4ab0076a8fb3b9ece3e9d8efe5e70e954a2f98dbc5af65b52a3a013d7f08e539e97c4206f
+EBUILD xdg-desktop-portal-1.18.3.ebuild 3411 BLAKE2B 861266ff2f661d1bf47424faeb884f6bf1e9c11925f107343f260a289851d649d3962d0fcb41bafa349c39ee379b311c5b24e566ab0a99c2b64073862c5e36c4 SHA512 5235cd5c198363612caf28b30380cf268f594093aa673743313f7565d8ead2a7d0d903ca859db977573f1e3f3d503e531b5b135e853f863fed2f1e2f1ffbc480
 MISC metadata.xml 572 BLAKE2B 5d1abb01d74881886beab22900a545b0364cd7b48990577a153bdd1d8125d517b8a26c89382b0ceb9e127e0cbd11d7462d3d74908facb521295314ddf2699723 SHA512 ffaa7cfd28794dd57d1229e5839a28cf5b178c6416cf1817e7e6753c7460c22e96e2997f005b80b574d7f4b49e3a0e5d9f44101258824edb00e328caf449b9d5
diff --git a/sys-apps/xdg-desktop-portal/files/0001-meson.build-allow-linux-to-build-without-flatpak-ins.patch b/sys-apps/xdg-desktop-portal/files/0001-meson.build-allow-linux-to-build-without-flatpak-ins.patch
deleted file mode 100644
index 9f758f7b5432..000000000000
--- a/sys-apps/xdg-desktop-portal/files/0001-meson.build-allow-linux-to-build-without-flatpak-ins.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/flatpak/xdg-desktop-portal/pull/1100
-
-From b734c44545276141b785dd31ff9c0c78a7801baa Mon Sep 17 00:00:00 2001
-From: "Anna (navi) Figueiredo Gomes" <navi@vlhl.dev>
-Date: Fri, 8 Sep 2023 22:07:06 +0200
-Subject: [PATCH 1/3] meson.build: allow linux to build without flatpak
- installed
-
-the old automake scripts would allow for building without flatpak, as the
-xml file would just not be copied (because it doesn't exist) so it
-wouldn't be used to generate files.
-
-this allows similar behaviour by not requiring the flatpak dependency in
-meson.
-
-Signed-off-by: Anna (navi) Figueiredo Gomes <navi@vlhl.dev>
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2254c0d..2366d9e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -21,8 +21,7 @@ endif
- 
- flatpak_intf_dir = get_option('flatpak-interfaces-dir')
- if flatpak_intf_dir == ''
--    flatpak_required = host_machine.system() in ['linux']
--    flatpak_dep = dependency('flatpak', version: '>= 1.5.0', required : flatpak_required)
-+    flatpak_dep = dependency('flatpak', version: '>= 1.5.0', required : false)
-     if flatpak_dep.found()
-       flatpak_intf_dir = flatpak_dep.get_variable(pkgconfig: 'interfaces_dir')
-     endif
--- 
-2.42.0
-
diff --git a/sys-apps/xdg-desktop-portal/files/0002-meson.build-allow-linux-to-build-without-bubblewrap.patch b/sys-apps/xdg-desktop-portal/files/0002-meson.build-allow-linux-to-build-without-bubblewrap.patch
deleted file mode 100644
index ce10d326828f..000000000000
--- a/sys-apps/xdg-desktop-portal/files/0002-meson.build-allow-linux-to-build-without-bubblewrap.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/flatpak/xdg-desktop-portal/pull/1100
-
-From 8cf28b590ab23e94d6b80eaa6893ed51542d3dd8 Mon Sep 17 00:00:00 2001
-From: "Anna (navi) Figueiredo Gomes" <navi@vlhl.dev>
-Date: Sat, 9 Sep 2023 01:20:36 +0200
-Subject: [PATCH 2/3] meson.build: allow linux to build without bubblewrap
-
-per the same logic as flatpak, there's no reason to force bwrap as a
-dependency to build xdp under linux, as there is systems without bwrap
-that would want to be able to build xdp
-
-Signed-off-by: Anna (navi) Figueiredo Gomes <navi@vlhl.dev>
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2366d9e..ad7faae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -112,8 +112,7 @@ libportal_dep = dependency('libportal',
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.2.90')
- libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
- 
--bwrap_required = host_machine.system() in ['linux']
--bwrap = find_program('bwrap', required: bwrap_required)
-+bwrap = find_program('bwrap', required: false)
- 
- have_libportal = libportal_dep.found()
- if have_libportal
--- 
-2.42.0
-
diff --git a/sys-apps/xdg-desktop-portal/files/0003-Make-flatpak-bwrap-optional.patch b/sys-apps/xdg-desktop-portal/files/0003-Make-flatpak-bwrap-optional.patch
deleted file mode 100644
index 78b0b3e522a2..000000000000
--- a/sys-apps/xdg-desktop-portal/files/0003-Make-flatpak-bwrap-optional.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5b4ad3e7a9828df2cd06d663d89800c346f5051f Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 22 Sep 2023 17:35:21 +0100
-Subject: [PATCH] Make flatpak, bwrap optional
-
-See https://github.com/flatpak/xdg-desktop-portal/pull/1100
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- meson.build       | 4 ++--
- meson_options.txt | 8 ++++++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index ad7faae..933eb54 100644
---- a/meson.build
-+++ b/meson.build
-@@ -21,7 +21,7 @@ endif
- 
- flatpak_intf_dir = get_option('flatpak-interfaces-dir')
- if flatpak_intf_dir == ''
--    flatpak_dep = dependency('flatpak', version: '>= 1.5.0', required : false)
-+    flatpak_dep = dependency('flatpak', version: '>= 1.5.0', required : get_option('flatpak'))
-     if flatpak_dep.found()
-       flatpak_intf_dir = flatpak_dep.get_variable(pkgconfig: 'interfaces_dir')
-     endif
-@@ -112,7 +112,7 @@ libportal_dep = dependency('libportal',
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.2.90')
- libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
- 
--bwrap = find_program('bwrap', required: false)
-+bwrap = find_program('bwrap', required: get_option('bwrap'))
- 
- have_libportal = libportal_dep.found()
- if have_libportal
-diff --git a/meson_options.txt b/meson_options.txt
-index edcbcd8..d1914ce 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,6 +2,14 @@ option('dbus-service-dir',
-        type: 'string',
-        value: '',
-        description: 'directory for dbus service files (default: PREFIX/share/dbus-1/services)')
-+option('bwrap',
-+       type: 'feature',
-+       value: 'enabled',
-+       description: 'Use bwrap (requires seccomp) for sandboxing for e.g. icon validation. Recommended.')
-+option('flatpak',
-+       type: 'feature',
-+       value: 'enabled',
-+       description: 'Enable flatpak integration')
- option('flatpak-interfaces-dir',
-        type: 'string',
-        value: '',
--- 
-2.42.0
-
diff --git a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.16.0-delay-open-fix.patch b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.16.0-delay-open-fix.patch
deleted file mode 100644
index 1e1598744c46..000000000000
--- a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.16.0-delay-open-fix.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/74
-https://github.com/flatpak/xdg-desktop-portal/pull/985
-https://github.com/flatpak/xdg-desktop-portal/commit/2a219279997c2124c8a639b0d009c9946ec97b40
-
-Fedora's backported it as well at https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/74.
-
-From 2a219279997c2124c8a639b0d009c9946ec97b40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Mon, 13 Mar 2023 12:38:17 +0100
-Subject: [PATCH] portal-impl: Only return found implementation if it launched
-
-If no portal backend for a given interface is found, a fallback is
-always tried anyway, despite that fallback not being listed as
-compatible with the current desktop environment.
-
-Sometimes it's good that a fallback is returned; e.g. the
-xdg-desktop-portal-gtk file chooser backend is technically usable
-anywhere, however, some backends might be specifically designed to only
-work in a specific desktop environment, e.g. xdg-desktop-portal-gnome.
-
-In order to avoid creating portals with non-functional backends, make
-sure it's possible to create a proxy object for the interface and D-Bus
-name, and that it launched successfully (i.e. has no name owner after
-creating the proxy).
---- a/src/portal-impl.c
-+++ b/src/portal-impl.c
-@@ -29,9 +29,12 @@
- #include <glib.h>
- #include <gio/gio.h>
- 
-+#include "xdp-utils.h"
-+
- static void
- portal_implementation_free (PortalImplementation *impl)
- {
-+  g_clear_pointer (&impl->dummy_proxies, g_hash_table_unref);
-   g_free (impl->source);
-   g_free (impl->dbus_name);
-   g_strfreev (impl->interfaces);
-@@ -55,6 +58,10 @@ register_portal (const char *path, gboolean opt_verbose, GError **error)
-   if (!g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, error))
-     return FALSE;
- 
-+  impl->dummy_proxies = g_hash_table_new_full (g_str_hash,
-+                                               g_str_equal,
-+                                               g_free,
-+                                               g_object_unref);
-   impl->source = g_path_get_basename (path);
-   impl->dbus_name = g_key_file_get_string (keyfile, "portal", "DBusName", error);
-   if (impl->dbus_name == NULL)
-@@ -198,8 +205,44 @@ load_installed_portals (gboolean opt_verbose)
-   implementations = g_list_sort (implementations, sort_impl_by_use_in_and_name);
- }
- 
-+static gboolean
-+create_dummy_proxy (PortalImplementation  *impl,
-+                    GDBusConnection       *connection,
-+                    const char            *interface,
-+                    GError               **error)
-+{
-+  g_autoptr(GDBusProxy) proxy = NULL;
-+
-+  g_debug ("Creating dummy proxy for %s on %s", interface, impl->dbus_name);
-+  proxy = g_dbus_proxy_new_sync (connection,
-+                                 G_DBUS_PROXY_FLAGS_NONE,
-+                                 NULL,
-+                                 impl->dbus_name,
-+                                 DESKTOP_PORTAL_OBJECT_PATH,
-+                                 interface,
-+                                 NULL,
-+                                 error);
-+  if (!proxy)
-+    return FALSE;
-+
-+  if (!g_dbus_proxy_get_name_owner (proxy))
-+    {
-+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+                   "Proxy has no owner");
-+      return FALSE;
-+    }
-+
-+  g_debug ("Dummy proxy created");
-+
-+  g_hash_table_insert (impl->dummy_proxies,
-+                       g_strdup (interface),
-+                       g_steal_pointer (&proxy));
-+  return TRUE;
-+}
-+
- PortalImplementation *
--find_portal_implementation (const char *interface)
-+find_portal_implementation (GDBusConnection *connection,
-+                            const char      *interface)
- {
-   const char *desktops_str = g_getenv ("XDG_CURRENT_DESKTOP");
-   g_auto(GStrv) desktops = NULL;
-@@ -216,15 +259,23 @@ find_portal_implementation (const char *interface)
-      for (l = implementations; l != NULL; l = l->next)
-         {
-           PortalImplementation *impl = l->data;
-+          g_autoptr(GError) error = NULL;
- 
-           if (!g_strv_contains ((const char **)impl->interfaces, interface))
-             continue;
- 
--          if (g_strv_case_contains ((const char **)impl->use_in, desktops[i]))
-+          if (!g_strv_case_contains ((const char **)impl->use_in, desktops[i]))
-+            continue;
-+
-+          if (!create_dummy_proxy (impl, connection, interface, &error))
-             {
--              g_debug ("Using %s for %s in %s", impl->source, interface, desktops[i]);
--              return impl;
-+              g_debug ("Failed to create dummy proxy on %s for %s: %s",
-+                       impl->dbus_name, interface, error->message);
-+              continue;
-             }
-+
-+          g_debug ("Using %s for %s in %s", impl->source, interface, desktops[i]);
-+          return impl;
-         }
-     }
- 
-@@ -232,10 +283,18 @@ find_portal_implementation (const char *interface)
-   for (l = implementations; l != NULL; l = l->next)
-     {
-       PortalImplementation *impl = l->data;
-+      g_autoptr(GError) error = NULL;
- 
-       if (!g_strv_contains ((const char **)impl->interfaces, interface))
-         continue;
- 
-+      if (!create_dummy_proxy (impl, connection, interface, &error))
-+        {
-+          g_debug ("Failed to create dummy fallback proxy on %s for %s: %s",
-+                   impl->dbus_name, interface, error->message);
-+          continue;
-+        }
-+
-       g_debug ("Falling back to %s for %s", impl->source, interface);
-       return impl;
-     }
---- a/src/portal-impl.h
-+++ b/src/portal-impl.h
-@@ -23,6 +23,7 @@
- #define __PORTAL_IMPL_H__
- 
- #include <glib.h>
-+#include <gio/gio.h>
- 
- typedef struct {
-   char *source;
-@@ -30,10 +31,12 @@ typedef struct {
-   char **interfaces;
-   char **use_in;
-   int priority;
-+  GHashTable *dummy_proxies;
- } PortalImplementation;
- 
- void                  load_installed_portals          (gboolean opt_verbose);
--PortalImplementation *find_portal_implementation      (const char *interface);
-+PortalImplementation *find_portal_implementation      (GDBusConnection *connection,
-+                                                       const char *interface);
- GPtrArray            *find_all_portal_implementations (const char *interface);
- 
- #endif  /* __PORTAL_IMPL_H__ */
---- a/src/xdg-desktop-portal.c
-+++ b/src/xdg-desktop-portal.c
-@@ -237,7 +237,8 @@ on_bus_acquired (GDBusConnection *connection,
-   init_document_proxy (connection);
-   init_permission_store (connection);
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Lockdown");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Lockdown");
-   if (implementation != NULL)
-     lockdown = xdp_dbus_impl_lockdown_proxy_new_sync (connection,
-                                                       G_DBUS_PROXY_FLAGS_NONE,
-@@ -259,40 +260,48 @@ on_bus_acquired (GDBusConnection *connection,
-   export_portal_implementation (connection, settings_create (connection, impls));
-   g_ptr_array_free (impls, TRUE);
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.FileChooser");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.FileChooser");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   file_chooser_create (connection, implementation->dbus_name, lockdown));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.AppChooser");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.AppChooser");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   open_uri_create (connection, implementation->dbus_name, lockdown));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Print");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Print");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   print_create (connection, implementation->dbus_name, lockdown));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Notification");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Notification");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   notification_create (connection, implementation->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Inhibit");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Inhibit");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   inhibit_create (connection, implementation->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Access");
--  implementation2 = find_portal_implementation ("org.freedesktop.impl.portal.Screenshot");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Access");
-+  implementation2 = find_portal_implementation (connection,
-+                                                "org.freedesktop.impl.portal.Screenshot");
-   if (implementation != NULL && implementation2 != NULL)
-     export_portal_implementation (connection,
-                                   screenshot_create (connection,
-                                                      implementation->dbus_name,
-                                                      implementation2->dbus_name));
- 
--  implementation2 = find_portal_implementation ("org.freedesktop.impl.portal.Background");
-+  implementation2 = find_portal_implementation (connection,
-+                                                "org.freedesktop.impl.portal.Background");
-   if (implementation != NULL)
-     {
-       export_portal_implementation (connection,
-@@ -313,47 +322,55 @@ on_bus_acquired (GDBusConnection *connection,
-                                                      implementation->dbus_name,
-                                                      implementation2->dbus_name));
- 
--  implementation2 = find_portal_implementation ("org.freedesktop.impl.portal.Wallpaper");
-+  implementation2 = find_portal_implementation (connection,
-+                                                "org.freedesktop.impl.portal.Wallpaper");
-   if (implementation != NULL && implementation2 != NULL)
-     export_portal_implementation (connection,
-                                   wallpaper_create (connection,
-                                                     implementation->dbus_name,
-                                                     implementation2->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Account");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Account");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   account_create (connection, implementation->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Email");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Email");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   email_create (connection, implementation->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.Secret");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.Secret");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   secret_create (connection, implementation->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.GlobalShortcuts");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.GlobalShortcuts");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   global_shortcuts_create (connection, implementation->dbus_name));
- 
- #ifdef HAVE_GLIB_2_66
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.DynamicLauncher");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.DynamicLauncher");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   dynamic_launcher_create (connection, implementation->dbus_name));
- #endif
- 
- #ifdef HAVE_PIPEWIRE
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.ScreenCast");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.ScreenCast");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   screen_cast_create (connection, implementation->dbus_name));
- 
--  implementation = find_portal_implementation ("org.freedesktop.impl.portal.RemoteDesktop");
-+  implementation = find_portal_implementation (connection,
-+                                               "org.freedesktop.impl.portal.RemoteDesktop");
-   if (implementation != NULL)
-     export_portal_implementation (connection,
-                                   remote_desktop_create (connection, implementation->dbus_name));
-
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.16.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.16.0-r1.ebuild
deleted file mode 100644
index a339198301e6..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="geolocation screencast systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	dev-libs/json-glib
-	>=sys-fs/fuse-3.10.0:3[suid]
-	x11-libs/gdk-pixbuf
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-delay-open-fix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-docbook-docs # requires flatpak
-		--disable-libportal # not packaged
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		$(use_with systemd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
-		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
-		! has_version sys-apps/xdg-desktop-portal-gtk; then
-		elog "${PN} is not usable without any of the following XDP"
-		elog "implementations installed:"
-		elog "  gui-libs/xdg-desktop-portal-lxqt"
-		elog "  gui-libs/xdg-desktop-portal-wlr"
-		elog "  kde-plasma/xdg-desktop-portal-kde"
-		elog "  sys-apps/xdg-desktop-portal-gnome"
-		elog "  sys-apps/xdg-desktop-portal-gtk"
-	fi
-}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.0-r2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.0-r2.ebuild
deleted file mode 100644
index 959007f5e9ff..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-any-r1 systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="geolocation flatpak seccomp systemd test"
-RESTRICT="!test? ( test )"
-# Upstream expect flatpak to be used w/ seccomp and flatpak needs bwrap anyway
-REQUIRED_USE="flatpak? ( seccomp )"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	dev-libs/json-glib
-	>=media-video/pipewire-0.3:=
-	>=sys-fs/fuse-3.10.0:3[suid]
-	x11-libs/gdk-pixbuf
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	flatpak? ( sys-apps/flatpak )
-	seccomp? ( sys-apps/bubblewrap )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-python/docutils
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/libportal
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	# These tests require connections to pipewire, internet, /dev/fuse
-	"${FILESDIR}/${P}-sandbox-disable-failing-tests.patch"
-
-	# https://github.com/flatpak/xdg-desktop-portal/pull/1100
-	"${FILESDIR}/0001-meson.build-allow-linux-to-build-without-flatpak-ins.patch"
-	"${FILESDIR}/0002-meson.build-allow-linux-to-build-without-bubblewrap.patch"
-	"${FILESDIR}/0003-Make-flatpak-bwrap-optional.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddbus-service-dir="${EPREFIX}/usr/share/dbus-1/services"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-		$(meson_feature flatpak)
-		# Only used for tests
-		$(meson_feature test libportal)
-		$(meson_feature geolocation geoclue)
-		$(meson_feature seccomp bwrap)
-		$(meson_feature systemd)
-		# Requires flatpak
-		-Ddocbook-docs=disabled
-		# -Dxmlto-flags=
-		-Ddatarootdir="${EPREFIX}/usr/share"
-		-Dman-pages=enabled
-		-Dinstalled-tests=false
-		$(meson_feature test pytest)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Install a default to avoid breakage: >=1.18.0 assumes that DEs/WMs
-	# will install their own, but we want some fallback in case they don't
-	# (so will probably keep this forever). DEs need time to catch up even
-	# if they will eventually provide one anyway. See bug #915356.
-	#
-	# TODO: Add some docs on wiki for users to add their own preference
-	# for minimalist WMs etc.
-	insinto /usr/share/xdg-desktop-portal
-	newins "${FILESDIR}"/default-portals.conf portals.conf
-}
-
-pkg_postinst() {
-	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
-		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
-		! has_version sys-apps/xdg-desktop-portal-gtk; then
-		elog "${PN} is not usable without any of the following XDP"
-		elog "implementations installed:"
-		elog "  gui-libs/xdg-desktop-portal-lxqt"
-		elog "  gui-libs/xdg-desktop-portal-wlr"
-		elog "  kde-plasma/xdg-desktop-portal-kde"
-		elog "  sys-apps/xdg-desktop-portal-gnome"
-		elog "  sys-apps/xdg-desktop-portal-gtk"
-	fi
-}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.3.ebuild
index 096cde882a78..a7cd8de88db2 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8