gentoo auto-resync : 24:03:2025 - 00:31:53

13 files changed, 133 insertions, 208 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3021b6d9b8cd..433a0b4a21b2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 751cb36f8497..dbf33181f4e9 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,7 +1,4 @@
 AUX curl-8.11.1-async-thread-close-eventfd.patch 1080 BLAKE2B fa1ff8ff20870c80a4c7dd0ef2ec116ce78a987b9659a77f513c44b6237f0b0b6bf48e547cefd6e157d85ee6113669bffe02e6f7321b19a8ffec12caa2d655f4 SHA512 a4662fbea884a05e151c0d100e012e9f1c1f8de53f70f20c9df6fc54ea9d293211475dd084bae32bf0508c7438971f921f6840cae4e9424589511dbe44584609
-AUX curl-8.12.0-multi.patch 5760 BLAKE2B 563bba68b61ab1f7cde20130b398e10fde4618b199d1db276d4c8864b1b68792ff6b209dce40311184fd73606a17f38a0cce263a3adea33d2881d3fa38b22911 SHA512 7e72c091e1aede53f3981df81972908c19d15925ad78f396b02e13a44ffd487bacddb4514d05609f0bae5d78c8a4ebcf648fed0076f28146ed3e4501ef97d960
-AUX curl-8.9.1-sigpipe.patch 773 BLAKE2B 7ef3bbd4ca9558621b4f1ea5cb9847705cd6331b7f3d5d2a950642d090c789b802c0ff4f96ff2805b9e1dfe807b14daaee223dbcb2ff1426458dadb3e71d1e79 SHA512 55e55da046425e9a60064ff79ec3f8ab37a10275210f46cfb10ad29e9a29cb137a28ba6a0effa90bfc46d687aab929565b97bfa7549ac8a202746e332d1fa6ed
-AUX curl-prefix-2.patch 1075 BLAKE2B 657ac450c9d50a08f62be72dc9d1bc68c494dcc0c8153f1a89d5cb50d240aa6bcd56b48242ed3ea1352da5cd5d98b8c6daaff6fdcc672a95a0233db1f8d27bdd SHA512 91a531291426477a68108dcc40656e6a56caabfda26f351d4b7cdb39e66f500ffd532f2417a81c5a789ea624b4f6325aa8006155292910612e54ab3d9daa3620
 AUX curl-prefix-3.patch 1068 BLAKE2B dbaf21f38874a308557997d6a3a7a1f9fdb817b22d9846b4d6bd2bae413b7177650f20f17b10bfcc4a6747a89470dc2672ce79ba67d08fc92ebbbba353ba6c3a SHA512 c10a0062564be885f36e7c37bb58f3aa59c387369b9aae6342f818d4671e31cec99fd9ddda3577f03d1f8e87b926b8d75b006ca543f41a264e8595af79242b62
 AUX curl-prefix-4.patch 1078 BLAKE2B 3211f94da95bb4299c3ffb34db160f92ca5ffaf2995854a97f5fa935895d31e39fe52bc9a9459071f2ba844a8bb86cbacf6fe9dc0e337499138507420d4cbf91 SHA512 ca2cec79636d69d38da41292d8da6d682c5522f0afc883b3210506f8c9c532e8231c205b7b940272de2d085be28cc3838ac721302377fef634751bb40b3b3941
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
diff --git a/net-misc/curl/files/curl-8.12.0-multi.patch b/net-misc/curl/files/curl-8.12.0-multi.patch
deleted file mode 100644
index b9405af8da5b..000000000000
--- a/net-misc/curl/files/curl-8.12.0-multi.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-https://github.com/curl/curl/issues/16236#issuecomment-2645385845
-https://github.com/curl/curl/commit/242a1439e7d8cdb72ae6a2fa2e705e2d9a2b7501
-
-
---- a/lib/setopt.c
-+++ b/lib/setopt.c
-@@ -1584,10 +1584,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option,
-       if(data->share->hsts == data->hsts)
-         data->hsts = NULL;
- #endif
--#ifdef USE_SSL
--      if(data->share->ssl_scache == data->state.ssl_scache)
--        data->state.ssl_scache = data->multi ? data->multi->ssl_scache : NULL;
--#endif
- #ifdef USE_LIBPSL
-       if(data->psl == &data->share->psl)
-         data->psl = data->multi ? &data->multi->psl : NULL;
-@@ -1628,10 +1624,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option,
-         data->hsts = data->share->hsts;
-       }
- #endif
--#ifdef USE_SSL
--      if(data->share->ssl_scache)
--        data->state.ssl_scache = data->share->ssl_scache;
--#endif
- #ifdef USE_LIBPSL
-       if(data->share->specifier & (1 << CURL_LOCK_DATA_PSL))
-         data->psl = &data->share->psl;
---- a/lib/transfer.c
-+++ b/lib/transfer.c
-@@ -567,12 +567,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
- #endif
-   data->state.httpreq = data->set.method;
- 
--#ifdef USE_SSL
--  if(!data->state.ssl_scache)
--    /* There was no ssl session cache set via a share, use the multi one */
--    data->state.ssl_scache = data->multi->ssl_scache;
--#endif
--
-   data->state.requests = 0;
-   data->state.followlocation = 0; /* reset the location-follow counter */
-   data->state.this_is_a_follow = FALSE; /* reset this */
---- a/lib/urldata.h
-+++ b/lib/urldata.h
-@@ -1199,7 +1199,6 @@ struct UrlState {
-   curl_prot_t first_remote_protocol;
- 
-   int retrycount; /* number of retries on a new connection */
--  struct Curl_ssl_scache *ssl_scache; /* TLS session pool */
-   int os_errno;  /* filled in with errno whenever an error occurs */
-   long followlocation; /* redirect counter */
-   int requests; /* request counter: redirects + authentication retakes */
---- a/lib/vtls/vtls_scache.c
-+++ b/lib/vtls/vtls_scache.c
-@@ -82,6 +82,17 @@ struct Curl_ssl_scache {
-   long age;
- };
- 
-+static struct Curl_ssl_scache *cf_ssl_scache_get(struct Curl_easy *data)
-+{
-+  struct Curl_ssl_scache *scache = NULL;
-+  /* If a share is present, its ssl_scache has preference over the multi */
-+  if(data->share && data->share->ssl_scache)
-+    scache = data->share->ssl_scache;
-+  else if(data->multi && data->multi->ssl_scache)
-+    scache = data->multi->ssl_scache;
-+  return scache;
-+}
-+
- static void cf_ssl_scache_clear_session(struct Curl_ssl_session *s)
- {
-   if(s->sdata) {
-@@ -792,7 +803,7 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf,
-                              const char *ssl_peer_key,
-                              struct Curl_ssl_session *s)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
-   CURLcode result;
-   DEBUGASSERT(ssl_config);
-@@ -826,7 +837,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf,
-                               const char *ssl_peer_key,
-                               struct Curl_ssl_session **ps)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
-   struct Curl_ssl_scache_peer *peer = NULL;
-   struct Curl_llist_node *n;
-@@ -870,7 +881,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
-                                  void *sobj,
-                                  Curl_ssl_scache_obj_dtor *sobj_free)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
-   struct Curl_ssl_scache_peer *peer = NULL;
-   CURLcode result;
-@@ -898,7 +909,7 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf,
-                              const char *ssl_peer_key,
-                              void **sobj)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
-   struct Curl_ssl_scache_peer *peer = NULL;
-   CURLcode result;
-@@ -924,7 +935,7 @@ void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf,
-                                 struct Curl_easy *data,
-                                 const char *ssl_peer_key)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
-   struct Curl_ssl_scache_peer *peer = NULL;
-   CURLcode result;
-@@ -1021,7 +1032,7 @@ CURLcode Curl_ssl_session_import(struct Curl_easy *data,
-                                  const unsigned char *shmac, size_t shmac_len,
-                                  const unsigned char *sdata, size_t sdata_len)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct Curl_ssl_scache_peer *peer = NULL;
-   struct Curl_ssl_session *s = NULL;
-   bool locked = FALSE;
-@@ -1092,7 +1103,7 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data,
-                                  curl_ssls_export_cb *export_fn,
-                                  void *userptr)
- {
--  struct Curl_ssl_scache *scache = data->state.ssl_scache;
-+  struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
-   struct Curl_ssl_scache_peer *peer;
-   struct dynbuf sbuf, hbuf;
-   struct Curl_llist_node *n;
diff --git a/net-misc/curl/files/curl-8.9.1-sigpipe.patch b/net-misc/curl/files/curl-8.9.1-sigpipe.patch
deleted file mode 100644
index d308fc4420e1..000000000000
--- a/net-misc/curl/files/curl-8.9.1-sigpipe.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/curl/curl/commit/3eec5afbd0b6377eca893c392569b2faf094d970
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 5 Aug 2024 00:17:17 +0200
-Subject: [PATCH] sigpipe: init the struct so that first apply ignores
-
-Initializes 'no_signal' to TRUE, so that a call to sigpipe_apply() after
-init ignores the signal (unless CURLOPT_NOSIGNAL) is set.
-
-I have read the existing code multiple times now and I think it gets the
-initial state reversed this missing to ignore.
-
-Regression from 17e6f06ea37136c36d27
-
-Reported-by: Rasmus Thomsen
-Fixes #14344
-Closes #14390
---- a/lib/sigpipe.h
-+++ b/lib/sigpipe.h
-@@ -39,6 +39,7 @@ struct sigpipe_ignore {
- static void sigpipe_init(struct sigpipe_ignore *ig)
- {
-   memset(ig, 0, sizeof(*ig));
-+  ig->no_signal = TRUE;
- }
- 
- /*
diff --git a/net-misc/curl/files/curl-prefix-2.patch b/net-misc/curl/files/curl-prefix-2.patch
deleted file mode 100644
index 0372038e7d59..000000000000
--- a/net-misc/curl/files/curl-prefix-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a3033ee39f2cc43cb17386b23cb304b010c2c96f Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Wed, 22 May 2024 16:18:51 +1000
-Subject: [PATCH] Update prefix patch for 8.8.0
-
----
- curl-config.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/curl-config.in b/curl-config.in
-index 085bb1e..c0bc6ce 100644
---- a/curl-config.in
-+++ b/curl-config.in
-@@ -145,7 +145,7 @@ while test "$#" -gt 0; do
-     else
-       CPPFLAG_CURL_STATICLIB=""
-     fi
--    if test "X@includedir@" = "X/usr/include"; then
-+    if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
-       echo "${CPPFLAG_CURL_STATICLIB}"
-     else
-       echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-@@ -153,7 +153,7 @@ while test "$#" -gt 0; do
-     ;;
- 
-   --libs)
--    if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-+    if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
-       CURLLIBDIR="-L@libdir@ "
-     else
-       CURLLIBDIR=""
--- 
-2.45.0
-
diff --git a/net-misc/geoipyupdate/Manifest b/net-misc/geoipyupdate/Manifest
index aafdd5672e3c..ee459dbc744d 100644
--- a/net-misc/geoipyupdate/Manifest
+++ b/net-misc/geoipyupdate/Manifest
@@ -1,3 +1,3 @@
-DIST geoipyupdate-0.0.1.tar.gz 17000 BLAKE2B e68d044fc748f0876745a21cb77e8098367ab7e260ff53e0e6b68ad88d7c1deb4b6f3977eeaf61a1b0a54f30f0fc32e302a89e996a9ccb69f9dc9c48c3d0df03 SHA512 8e78866f083b3ab8ef445d82e4d9081f7f59437348638e951c615f610e382ac5b7f9dc08c3a28735322442a22d276cfed12dcd375ac613f0d18f10ef94b200b7
-EBUILD geoipyupdate-0.0.1.ebuild 629 BLAKE2B f1e3031215f01a5e770f604cb156c8552b396d11d90036d3b24f9b89976b2d498a4eb14919ad41dc2c6dc45c6bf3f1a87b42b0f7e52fd38acb673b6ffc22ded9 SHA512 fb5281140577579e89775381a6308351b1c92bae06426f04f2a86d92dac560df1ae8cfd509aa17965ac238a443b8e7ac806e433a2c6266690d134b5ea99fb759
+DIST geoipyupdate-0.0.3.tar.gz 17309 BLAKE2B a604446e2ba7bee329ad14369c0fc8dc8f474017d589be9d1aa6a38f589a338eec86479cb2cc9f8db1a678de01d97476f71d88fac09e00988c5bb07d10fc67c7 SHA512 ce9c780d757dee206f679420b4fcd6e0a5a32e19048f563ee6186ff8f8207c44effbe98aa10c96a66992c7e05b9176f21c0dc23af3bc33528749a4ba61bb68f2
+EBUILD geoipyupdate-0.0.3.ebuild 636 BLAKE2B 3b7cdde988d822da83bfcf5ca3e459fdfac8ee1fc70dd8ae8f21c0a3cc4580f96382167dd431322957fda5ead3787d6eb3b9374b1a1bf07666804da77d9c705e SHA512 57a40a0d07da410c4988d4e26410df168cad8e50941a42485c55ef34b1fcc90f5e14e993ac1920025b3c0c8ea4bcb1f2b2fe0f62b09b20992c1d74ee408c7da0
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild b/net-misc/geoipyupdate/geoipyupdate-0.0.3.ebuild
index 6212aa8469a4..42ac0a2c95f2 100644
--- a/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild
+++ b/net-misc/geoipyupdate/geoipyupdate-0.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 4cfa74f4d74e..dc11222d68b7 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -6,5 +6,6 @@ DIST nextcloud-client-3.15.2.tar.gz 15671238 BLAKE2B ea98587f4183d42d3e6ace54c0c
 DIST nextcloud-client-3.15.3.tar.gz 15683038 BLAKE2B 535b6f8fc70cbfb63c5c87f09f31da943df5e6dd9d218d2289beda51f6d10eec2e99a4bd1efe4f9b4b373c54414ec4c3b36a9e6968134733b7fe942ea2d26099 SHA512 bf451681c352c75290c92780a84c37456ec199890081f6e7f0f1b14e302c4e14a1998a0fa90e7b4702325a1f447a7538bec58e9021c2269bcf04f9275925b365
 EBUILD nextcloud-client-3.14.4.ebuild 2855 BLAKE2B 14aff183dd4d2b643987a7623a5b6970fe640091db2e6888497a23db47b7d2e6650c7f5c2a117a30500431360b36f2e1b128293cb0521f3b8716198fb2adf00e SHA512 a88028b3c96432db7bc14013989e3768be7f40acb9b3b51f10f8a2a9dddecaa757ec2e9fa98e15af67b8488923122a2b361037f8796f536b61595986f2496755
 EBUILD nextcloud-client-3.15.2-r1.ebuild 3120 BLAKE2B 862547a8bc6692ede058af0354930b04277f117256de2d042613ef254cfa908a2af3214983f43c7e1fadb7b4581f5d240bdd98f0e25ac66f86c90a3e3230ff5c SHA512 86c4e7f5c17d39a47bd0d653747f3f0c0b3a94ccc041c67aebe8cb99e82e2ffc691eb20919d11ddc90cf812050e31df6993aefb7c98523a10bf875ae55b94b55
+EBUILD nextcloud-client-3.15.3-r1.ebuild 3167 BLAKE2B 18bca5889201b91c956080ea82430363074e303c0b7c3a7cad319e7d4e96478a717c7e45b5cf625b387273088fa687c9aa1ae190a51404ec4ded40545b9f2644 SHA512 312128d7d57cfbe5e507a8608272056ab9e2a89a0ba21186c4e57fab1db16a27cbd3b2d90ed131444636f2be045f27c8cc62c965e28c62c67a1fec174fda3460
 EBUILD nextcloud-client-3.15.3.ebuild 3120 BLAKE2B 862547a8bc6692ede058af0354930b04277f117256de2d042613ef254cfa908a2af3214983f43c7e1fadb7b4581f5d240bdd98f0e25ac66f86c90a3e3230ff5c SHA512 86c4e7f5c17d39a47bd0d653747f3f0c0b3a94ccc041c67aebe8cb99e82e2ffc691eb20919d11ddc90cf812050e31df6993aefb7c98523a10bf875ae55b94b55
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.15.3-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.15.3-r1.ebuild
new file mode 100644
index 000000000000..334b80d283d2
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.15.3-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake qmake-utils virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="
+	https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/nextcloud/desktop/commit/49a7c8d7874643da2550793877115c7f3dbd2d05.patch
+		-> ${PN}-3.15.2-fix-macosvfs-file-sharing.png.patch
+"
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	dev-libs/glib:2
+	>=dev-libs/openssl-1.1.0:0=
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	dev-qt/qt5compat:6
+	>=dev-qt/qtbase-6.6.0:6[dbus,gui,network,sql,sqlite,ssl,widgets]
+	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtsvg:6
+	dev-qt/qtwebsockets:6
+	kde-frameworks/karchive:6
+	kde-frameworks/kguiaddons:6
+	net-libs/libcloudproviders
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/kio:6
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:6[widgets] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtbase:6[concurrent,xml]
+	|| (
+		gnome-base/librsvg
+		media-gfx/inkscape
+	)
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	dolphin? ( >=kde-frameworks/extra-cmake-modules-5.106.0 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+	# https://github.com/nextcloud/desktop/pull/7383
+	"${FILESDIR}"/${PN}-3.14.2-doc-fix.patch
+	# https://github.com/nextcloud/desktop/pull/7691
+	"${DISTDIR}"/${PN}-3.15.2-fix-macosvfs-file-sharing.png.patch
+)
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+	# The image under images/building/path.png does no longer
+	# exist. This is already fixed upstream and can be dropped on the
+	# next bump
+	sed -i '/images\/building\/path.png/d' doc/building.rst || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPLUGINDIR=$(qt6_get_plugindir)
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		-DBUILD_WITH_WEBENGINE=$(usex webengine)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	TEST_VERBOSE=1 virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
+		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
+		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
+		elog "have to authenticate manually every time you start the nextlcoud client."
+		elog "See https://bugs.gentoo.org/912844 for more information."
+	fi
+}
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index d34a4e0fb84f..409fd332b0d5 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,3 @@
 EBUILD tigervnc-xorg-module-1.14.1.ebuild 447 BLAKE2B 71f6623a95854d1795f4379302c2278401ee55c41556db7b6e2de21708f3ec4f413e8e699a9f64910ca5255e7b6bff15a6279dace1c907a6f8838be7d8ede540 SHA512 4bff3f4d8af5143693fdfd46c992e08076ef691bd688ff9c03de56d10f66f6f2067ee08436921b691781e3855c6ac405a75d6d2c46e840ea2d33457fe16cb4a1
-EBUILD tigervnc-xorg-module-1.15.0.ebuild 452 BLAKE2B e18fafce802679f57fb85623e75fd7a048cf63719656422e98cf1fd36737d9a27dd1cd3c4aac7b4c2759e9f36041c195fa26505a59605801277849bc03f2311f SHA512 3155c3696b40d9374c5c8544d6498ce3f9987f693ed6bb250361cd7686be5ad6261d1a50e5069c6e18be6e24a677991a914abdd2f972afac4d87e5ed5bd10a1f
+EBUILD tigervnc-xorg-module-1.15.0.ebuild 448 BLAKE2B 89fdd712e8f45cc8aa72b139011099c661a98e835ccaccf2a5ca2c6d261f04e3a7e1cb27f6cb1b7e8a587c4e3d79be872400ab8358dc815662279115e169ec89 SHA512 4c3bc2e2c8d94e381d6a8f3cdf95294a232a2d7d2a2d6c159a05016c31382fb1227c184c1f8b32641ebb09d11fc06a922f935d265f0a273aedfbcbc57f844087
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild
index 2e6cd6b87324..aaa89e3f5641 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-misc/tigervnc-${PV}[server]
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index b8328a4ffb78..4f227e02f964 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,6 +9,6 @@ DIST tigervnc-1.15.0.tar.gz 2126369 BLAKE2B c8646860884ae8fec7f81d9e87967bb279e7
 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
 DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363
 EBUILD tigervnc-1.14.1-r3.ebuild 5627 BLAKE2B db59a02eb600fee173539da9f7949e4e9cabb3dca487bb12f1983362888dc4a264f25c6acdcaac4427aeb3ce9e67431974ce08c4bdd292d3bfe1b5012c9249bd SHA512 7a9a27c13a46a9370cb18a494738f6e53524450d085bc00d84b7a789f97757ee1e301886a71baa294323afea810ffd69c81f565ea42db439759c04a4cec4228c
-EBUILD tigervnc-1.15.0.ebuild 5589 BLAKE2B f584f9a0d90c45920441569c28652a1f7be7e58eedc35966a23c1a44f75053304554c53a895a4e8315d4427d01534ff0835ffba0f5ddfdd0af978855cb4da5dc SHA512 f9d3fad99da577d5e0a4208d25f3c1721c4b471f379b6c690949f5baa893d1f4e758c148132215148b3ad5225abaea9b33e787d8ec8f1ca7d5f402a8b1c65b27
+EBUILD tigervnc-1.15.0.ebuild 5585 BLAKE2B a5f1d6abb144f30436f50b17440fcd3a01cce76251a1fa0c69235239451553fc23d58e55e1f6fb8acb57bdd18bcabc255564cbaca494f76254f3df5d7311f4db SHA512 ead25142812b51247b233b2501a5177e6cc40608d75c8311d241ce4807b3f762b2af955593cfa7ea323b31f90d4a3fb3e7a8fee2fff01d3d63c61484e54dcefa
 EBUILD tigervnc-9999.ebuild 5500 BLAKE2B 5b96af09bf491a9a0cdd87b8a0cf77360759e2e5550deeab0b626b3b4cf909d437fd317d57757e2ef93cbf8f8b2a2b997d8b7d861148dce3f4c44e5b15e90a44 SHA512 6f2a2b0a5d11a6d26d6faec08fa5e670d28e735b13d562e0af6ab6c2e201d031f845884586c5e67c40cf810bcebeb06cd00e6bbdb66cd3e6e66d5704f0624ab5
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.15.0.ebuild b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
index 182341e8300f..597b2932b10a 100644
--- a/net-misc/tigervnc/tigervnc-1.15.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 else
 	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2"