bump jellyfin-mpv-shim

https://bugs.gentoo.org/947266

app-office/beancount/Manifest

@@ -1,2 +1,2 @@
 DIST beancount-2.3.6.tar.gz 1720239 BLAKE2B 769aa27a9edc201e33a85f92780b4140b1758a35ca865255183bdcaf4c515ba3bf4c6711aa2842c9219027a44a7cc334c39b48eb36f5145caa689ba90cda64d5 SHA512 52b65f99753e9473aae7736419d104e46b422b33f854170cc0242a95c1d12483aae95264138f81d28c9a7b50ca961e75163cce83868db5bcc9afe7d2337f3036
-EBUILD beancount-2.3.6.ebuild 613 BLAKE2B 8654c6bbd2dcc897109b75503ccf4f0f53fbff607d521f837470a56d74e35c3962e5d338330ea602efeb19a495fc026326896ac89dc76d73af58ca249cc513cb SHA512 4bee9e1dd6c8bd63a862d161d38b370f029e05d990054b5c8e7360615acc4b82bf77b1788570fc84763011a21aa47a65971dc1a30fa692151ced0070b43be09f
+EBUILD beancount-2.3.6.ebuild 665 BLAKE2B 79d31fba28505a66a04b03d926194d4bec38dbdff6324568246b4a09383d2334a8e8d19be41564e5f41f1f56b1ad6990331b3cb535bf11c1eda286322bb41128 SHA512 0dff509a67dbe1911f5650ba3dabbcf014c4c6a75aac89cf01cfd0a8dda0d7877b90632989aa92fea6c43a3a233875cd5a987cd54a771cef4ad2814b64747867

app-office/beancount/beancount-2.3.6.ebuild

@@ -3,6 +3,8 @@
 
 EAPI=8
 
+#DISTUTILS_EXT=1
+#DISTUTILS_USE_PEP517=meson-python
 PYTHON_COMPAT=( python3_{11,12,13} )
 
 inherit distutils-r1

media-libs/jellyfin-apiclient-python/Manifest

@@ -1,2 +1,3 @@
-DIST jellyfin-apiclient-python-1.9.2.tar.gz 29535 BLAKE2B ba12075a54df646c02fe437c576e3a19f38082080e6c136d88abf45f2eaba5d308259f16df46b4c7a5d76978ebf3392111fd0b3b3d2ee2c9496acf64fb8553b6 SHA512 43f1850c2904f200a9055b8f579534c486f0f29ca04004bd5cda58f6d2a24275a5e4ceb356344335a660f53cc81f47aa4749c048642e5f4e05b640e11a574e37
-EBUILD jellyfin-apiclient-python-1.9.2.ebuild 729 BLAKE2B 26ebb0e1eb985405dc609c83f93299e5c2b6f7c2d39d810a4dc221f35c3757b4c8ad0fcd45e016600dfbc27a76290733e4872a5bb1a2f5fd6bede9988bce77f4 SHA512 3e95bb065fb5fda303734d91b0cf236fd59941e581474421a0b48f903b4a318b61fb259ca775e631ca398b155229e6b7030865617d46e94decba99e23f0fe589
+AUX set_build_backend.patch 286 BLAKE2B 4baa101d9c9943760520a976a199f9a41e868a45b993ade42866e78e137d25c7a20810344b84c1a6f97bcba693a4ba4830c0fbc2ff77d22b521458172d4d7308 SHA512 be3e0ed5094375be9f1d3e04e332118e9b902a17e644ded3c0554e48f116a2b9655f2e6988882f6b6cf23926d1a91167f9de0ea164634cbed1bc194b5e6f1e88
+DIST jellyfin-apiclient-python-1.11.0.tar.gz 36454 BLAKE2B 057dacb9640a3cc938ddafc4503b472bc4b690c86c01e706bdf53289d065455ea03d0b4bf37173b5e2195615c79d6a5acc5e8d633c6812f9d9836629d8e8492c SHA512 980ff946f2cdd8ff2e0628a0bf3e245c3fa708d8b92d505e5de4b062a8328cea68cb36451467b87b7230a65b27cb6f29b814f18ec972e322855a2dc43e307693
+EBUILD jellyfin-apiclient-python-1.11.0.ebuild 821 BLAKE2B 64b2e58d6d07d2dbd615dc514dae19eae13decfa23bb09b7cc80ce2ffa3f101a74463028da1ef2d18eb7ba84bae578e0366b8f5de90815264a3812697e4f0bdc SHA512 472d627bd123e07adc0978e26c6017f682db80f906af4cc8d3f6d999a15a679f00ef9a914d7e79c6fe77092b8d5b011e8e69b5f4aeaf74d3493d10a15effb3bd

media-libs/jellyfin-apiclient-python/files/set_build_backend.patch

@@ -0,0 +1,11 @@
+diff --git a/pyproject.toml.orig b/pyproject.toml
+index dece500..89c9ad9 100644
+--- a/pyproject.toml.orig
++++ b/pyproject.toml
+@@ -1,5 +1,6 @@
+ [build-system]
+ requires = [ "setuptools>=61.0.0",]
++build-backend = "setuptools.build_meta"
+ 
+ [project]
+ name = "jellyfin-apiclient-python"

media-libs/jellyfin-apiclient-python/jellyfin-apiclient-python-1.11.0.ebuild

@@ -1,8 +1,9 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11,12,13} )
 
 inherit distutils-r1
@@ -18,6 +19,11 @@ else
 	KEYWORDS="amd64"
 fi
 
+RESTRICT="mirror test"
+
+PATCHES=(
+	"${FILESDIR}/set_build_backend.patch"
+)
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -27,7 +33,6 @@ DEPEND="
 dev-python/requests
 dev-python/urllib3
 dev-python/websocket-client
-dev-python/six
 dev-python/certifi
 "
 RDEPEND="${DEPEND}"

media-video/jellyfin-ffmpeg/Manifest

@@ -1,2 +1,2 @@
-DIST jellyfin-ffmpeg_6.0.1-7_portable_linux64-gpl.tar.xz 52477444 BLAKE2B c428a5f3b52e605b864c33fecc02bc6f5566906ee36a9db210719f06cbf2bbb1624ef884caee4f3fa566897f6aca9b3dbcbbb68e74987f7feca81af5b19221e8 SHA512 d9fa03401f53c017a8cbff68d8e38f1155832fa1b9f6a8d92c8ad5c57a1385cc8efcdb114208d1c4bb5e7af4e44584b3103fb5bd796bb96d25b1ca36dcdc7178
-EBUILD jellyfin-ffmpeg-6.0.1.7.ebuild 851 BLAKE2B da97503165196227f19e0e2a5708eeb61d4495545872cb51e868507a77959572ce2c039fc6097a10f0da2bb17d09a9bb982272e37fb3b6eee33148c06f9833f8 SHA512 9f3e2e65e3cfa863112eba753f6ff6965d84824a0ba138e136ce05f070758888799a23a7cbe9315b2a72bff00373947a73fd242f43cca061f52dfd636bf99365
+DIST jellyfin-ffmpeg_7.0.2-9_portable_linux64-gpl.tar.xz 55574212 BLAKE2B 33d0f7aa85a27623c3a46e75278173259b0116b2c5d68fdfa6fa30c58902382bf512d3ec8088545c76e68e327a3ee121aa7dd9164dfe62873ddb700195edf69c SHA512 cb9e29f4e8b0909aa6ac890ca7a554e9041f7760cfb74bc04f7ffe7baab7d6677d65db96a965e693f0338fcd66544120c93f749a16b03a8f4cf30844519e7079
+EBUILD jellyfin-ffmpeg-7.0.2.9.ebuild 801 BLAKE2B d32db6c1a4ccbc816163cf8c3086f76264a2240581319b512c2770ffea4c5a188cb1de7cd539528fe4f8659a789e9cda40568600142cf72645b72db1119c0128 SHA512 1becbe94ab7653190c9083d531b79ff9b4dfb2fc7ea17eac12a98c8888e9551a58ee63d62dd4b844275e70c36362855cadb9e73771c581e19ce159dcfe8ee539

media-video/jellyfin-ffmpeg/jellyfin-ffmpeg-7.0.2.9.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DESCRIPTION="Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media."
+DESCRIPTION="Jellyfin build of ffmpeg with streaming enhancements."
 
 UPSTREAM_VERSION="${PV%.*}-${PV##*.}"
 HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/"

media-video/jellyfin-mpv-shim/Manifest

@@ -1,3 +1,3 @@
 AUX no-shaders.patch 390 BLAKE2B 24e024a92a67f27500ed780c7d29289499b9a3bbe414c5d47fec97c17d94bc5e2919112394bb0305644626cb360b4a77eea14128e74c4ba475d47c91b3287393 SHA512 b3b745be2954c934a2aa5a041aec1e7ea7c031ba654b9c2f41344d22dda23cd8ac7a08b921458a81ff107a85893d9543a5f8ecbab50eb2e64a6b01574735b168
-DIST jellyfin-mpv-shim-2.8.0.tar.gz 570311 BLAKE2B 72eadc434fd09706cd617752487f39686775274ac20b45085aa26490fba6d43d37ec0f6984a91f4001df40e5b31253c17a978f9a9ec8e5ea14bc3ab8015001d9 SHA512 7d26307625ed5a543a333143285d757db70bd2f8337c26cb42257c77f53fd8f8257ffc51ca70788c39b0f17b77c6c44bafb46b28a81a2381530970ee49df9653
-EBUILD jellyfin-mpv-shim-2.8.0.ebuild 985 BLAKE2B ea633d721416f4517e1d9ea44158a938fdd29119e5d47c21b2e5663dfe1bef1df67acc94dd01ef19577bf59c3c5ee4f47d410727d2f396f855e2c38e9d3c13b8 SHA512 b76b13fb0cd23af37134bf5f3cb488d079a4cee734ad07c0d0ffd8f055139b1ca01140843b7c7da1bae33e538f5c617306fc25f896ea86bbbf397c0b9ffcd9fd
+DIST jellyfin-mpv-shim-2.9.0.tar.gz 578962 BLAKE2B 2892baaa822d784f3a1b96086bcdb9ebdb8ea4711b92c071dc47ea6ce4f4b5934acc020d55c7ed9d1a643fd5c236117c3d045c759d1f6eb460483c11853241bb SHA512 9b01cd3f592e0cc6f6907a6e2af971427132662557e4f4ab98e9a54e2cb8f97846bc8fa4e6da14856aa70e3a1549610e919ba8e43ae569f70e06f3d4b71ff2dc
+EBUILD jellyfin-mpv-shim-2.9.0.ebuild 985 BLAKE2B ea633d721416f4517e1d9ea44158a938fdd29119e5d47c21b2e5663dfe1bef1df67acc94dd01ef19577bf59c3c5ee4f47d410727d2f396f855e2c38e9d3c13b8 SHA512 b76b13fb0cd23af37134bf5f3cb488d079a4cee734ad07c0d0ffd8f055139b1ca01140843b7c7da1bae33e538f5c617306fc25f896ea86bbbf397c0b9ffcd9fd

net-misc/nextcloud-client/Manifest

@@ -0,0 +1,7 @@
+AUX nextcloud-client-3.14.2-doc-fix.patch 1253 BLAKE2B 8e0c44c5fdb02fc6d815c70a3fb8a9b28fe7d68e2d8b3a5a297a26c194a8866c39222df740cb1ecd70d7f615f491dea5f229b5bf9bf5ec3f7995d2f20254e518 SHA512 b9efc5723eb2f52ba7fc90325696fada2ddc88b47d47df576cfc74750a97b55bad77acda274983530f43c503ded8e4d7cc444005dd62b699926f46fdb2bd87aa
+AUX nextcloud-client-3.15.2-netrc.patch 1769 BLAKE2B f1d0e790feead13940c62c20ec54414ff498b2abb1850af21f509476857b51111c2893db024c5af2b56711b5aa220d2179e8efbf6d24e0a28866113fabf9d7fd SHA512 fe738c200b610c7f881ffce0399ee5abc17fe284b95dcd78666961a50b9e4d67d0e9c57919c04a9b5b56005445bd41f581a355f59d7477131008d3c12f0d682d
+AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
+DIST nextcloud-client-3.15.2-fix-macosvfs-file-sharing.png.patch 727 BLAKE2B 77d87c47caa28c0d60afdef161c05a365d953e31e7331fd4b07adfe232ddd04a6108ad325a25befe961862dccb118c251239b84cfb63f1c72c205df31055ad69 SHA512 d4d8928aa63b7e174c7fe8099d349a5779e8be1b1a71dfecfded9f971533ba677fc85013c53c7cafdc05e1aed81820c6ef3b5e7c3f6a5cae62fc284a2a9371db
+DIST nextcloud-client-3.15.2.tar.gz 15671238 BLAKE2B ea98587f4183d42d3e6ace54c0cd8b2208e7e21bfbb2385af84c8688b2d5464171f90e287302c5d6081b234b8cbec4e2b05635d1385a2980f133bba7127a6203 SHA512 982b74d57954440496f973781aa6a719d316b3651fecbb5da4d4b211dda0574094b2ba35f83c6afe2e67c7be095528e0cf8544e9214e8d9db445f1ab95c8c256
+EBUILD nextcloud-client-3.15.2-r1.ebuild 3205 BLAKE2B 8f42717f3f09eaf080f49082c39bc73064e085bf2a4fccb4c9d8fef7559b06698769736a4951b0ea162ba86b17d15378417e056104339f5ae57eb1abad3c505f SHA512 4aaa95ac4b9dd7f1715a962bb8d3f79a9f5f431550cd4f4d54c92d4722f518714034b6f15a9738e3624bc3620ab378c9001755215adcc971f02099a13719364a
+MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32

net-misc/nextcloud-client/files/nextcloud-client-3.14.2-doc-fix.patch

@@ -0,0 +1,35 @@
+From 463b4e63046a907581d5f4899aaddfa0afd9120a Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Tue, 22 Oct 2024 12:18:31 +0200
+Subject: [PATCH] doc: delete section containing non-existing images
+
+Those images where deleted in 6d3335bd60ba ("Update instructions to
+build on Windows.") and are no longer available. Hence, drop the
+whole section referencing them.
+
+Fixes: 6d3335bd60ba1cb499985fc15e0b918fe8c404f4
+--- a/doc/building.rst
++++ b/doc/building.rst
+@@ -215,19 +215,6 @@ System requirements
+ - Microsoft Visual Studio 2022 and tools to compile C++
+ - `KDE Craft <https://community.kde.org/Craft>`_
+ 
+-Setting up Microsoft Visual Studio
+-----------------------------------
+-
+-1. Click on 'Modify' in the Visual Studio Installer:
+-
+-  .. image:: ./images/building/visual-studio-installer.png
+-    :alt: Visual Studio Installer
+-
+-2. Select 'Desktop development with C++'
+-
+-  .. image:: ./images/building/desktop-development-with-cpp.png
+-    :alt: Desktop development with C++
+-
+ Handling the dependencies 
+ -------------------------
+ We handle the dependencies using `KDE Craft <https://community.kde.org/Craft>`_ because it is easy to set it up and it makes the maintenance much more reliable in all platforms.
+-- 
+2.45.2
+

net-misc/nextcloud-client/files/nextcloud-client-3.15.2-netrc.patch

@@ -0,0 +1,56 @@
+diff --git a/src/cmd/netrcparser.cpp b/src/cmd/netrcparser.cpp
+index 266fe4f..15417e1 100644
+--- a/src/cmd/netrcparser.cpp
++++ b/src/cmd/netrcparser.cpp
+@@ -14,8 +14,7 @@
+ 
+ #include <QDir>
+ #include <QFile>
+-#include <QTextStream>
+-#include <QStringTokenizer>
++#include <QRegularExpression>
+ 
+ #include <QDebug>
+ 
+@@ -58,32 +57,33 @@ bool NetrcParser::parse()
+     }
+     QString content = netrc.readAll();
+ 
+-    auto tokenizer = QStringTokenizer{content, u" \n\t"};
++    auto tokens = content.split(QRegularExpression("\\s+"));
+ 
+     LoginPair pair;
+     QString machine;
+     bool isDefault = false;
+-    for(auto itToken = tokenizer.cbegin(); itToken != tokenizer.cend(); ++itToken) {
+-        const auto key = *itToken;
++    for(int i=0; i<tokens.count(); i++) {
++        const auto key = tokens[i];
+         if (key == defaultKeyword) {
+             tryAddEntryAndClear(machine, pair, isDefault);
+             isDefault = true;
+             continue; // don't read a value
+         }
+ 
+-        if (itToken != tokenizer.cend()) {
++        i++;
++        if (i > tokens.count()) {
+             qDebug() << "error fetching value for" << key;
+             return false;
+         }
+-        auto value = *(++itToken);
++        auto value = tokens[i];
+ 
+         if (key == machineKeyword) {
+             tryAddEntryAndClear(machine, pair, isDefault);
+-            machine = value.toString();
++            machine = value;
+         } else if (key == loginKeyword) {
+-            pair.first = value.toString();
++            pair.first = value;
+         } else if (key == passwordKeyword) {
+-            pair.second = value.toString();
++            pair.second = value;
+         } // ignore unsupported tokens
+     }
+     tryAddEntryAndClear(machine, pair, isDefault);

net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch

@@ -0,0 +1,31 @@
+Gentoo's toolchain always sets F_S (level 2 at minimum) by default.
+
+https://bugs.gentoo.org/890072
+--- a/cmake/modules/DefineCompilerFlags.cmake
++++ b/cmake/modules/DefineCompilerFlags.cmake
+@@ -47,12 +47,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+     if (CMAKE_BUILD_TYPE)
+         string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-        if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND (NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]"))
+-            check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
+-            if (WITH_FORTIFY_SOURCE)
+-                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+-            endif (WITH_FORTIFY_SOURCE)
+-        endif()
+     endif()
+ endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -31,10 +31,6 @@ if(NOT MSVC)
+   endif()
+ 
+   string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-  if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND ((NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]") AND (NOT ${CMAKE_CXX_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]")))
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+-  endif()
+ 
+   if (CMAKE_CXX_COMPILER MATCHES "Clang")
+     # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU

net-misc/nextcloud-client/metadata.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
+		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+		<flag name="webengine">Enable old Flow1 login using <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">nextcloud/desktop</remote-id>
+	</upstream>
+</pkgmetadata>

net-misc/nextcloud-client/nextcloud-client-3.15.2-r1.ebuild

@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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,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
+	# https://github.com/nextcloud/desktop/pull/7698
+	"${FILESDIR}"/${PN}-3.15.2-netrc.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=(
+		-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
+}

profiles/targets/desktop/make.defaults

@@ -17,18 +17,18 @@ USE="${USE}
 	fcitx4 truetype fontconfig spell harfbuzz xft
 	opengl vaapi xinerama libkms dri egl qsv vulkan vmaf libplacebo shaderc opencl
 	bluray drm dvd lcms bdplus v4l aacs colord optical udf archive
-	pulseaudio ogg mp3 alsa vorbis native-headset ofono-headset opus
+	pulseaudio pipewire ogg mp3 alsa vorbis native-headset ofono-headset opus
 	jpeg zimg png tiff gif exif xmp svg hdri heif corefonts webp raw x265 libde265 wallpapers vpx gdk-pixbuf libdovi
 	udisks smartcard cryptsetup pkcs7 gpg
 	bluetooth usb
 	gdbm
 	gtk cairo
 	wifi
-	modemmanager networkmanager nftables conntrack
+	modemmanager networkmanager nftables conntrack libproxy
 	cups scanner ocr printsupport
 	libnotify
 	hwaccel
-	qt qt5
+	qt qt5 qt6 qml kf6compat
 	rustfmt
 	libxml2
 	"

profiles/targets/desktop/package.accept_keywords/calibre

@@ -1,6 +0,0 @@
-=dev-python/cchardet-2.1.7 ~amd64
-=dev-python/sip-6.3.1 ~amd64
-=dev-python/PyQt-builder-1.10.3 ~amd64
-=dev-python/PyQt5-5.15.5_pre2107091435 ~amd64
-=dev-python/PyQtWebEngine-5.15.5_pre2108100905 ~amd64
-app-text/calibre ~amd64

profiles/targets/desktop/package.accept_keywords/ghostty

@@ -0,0 +1,4 @@
+<x11-terms/ghostty-2.0.0
+<x11-terms/ghostty-terminfo-2.0.0
+=dev-lang/zig-0.13.0-r2
+=app-eselect/eselect-zig-1-r1

profiles/targets/desktop/package.accept_keywords/intel

@@ -2,5 +2,5 @@ media-libs/libva ~amd64
 media-libs/gmmlib ~amd64
 media-libs/libvpl ~amd64
 media-libs/libvmaf ~amd64
-media-libs/oneVPL-intel-gpu ~amd64
+media-libs/vpl-gpu-rt ~amd64
 media-libs/libva-intel-media-driver ~amd64

profiles/targets/desktop/package.accept_keywords/mesa

@@ -0,0 +1,2 @@
+=media-libs/mesa-24.2.6* ~amd64
+=dev-util/intel_clc-24.2.6* ~amd64

profiles/targets/desktop/package.accept_keywords/mkvtoolnix

@@ -0,0 +1 @@
+=media-video/mkvtoolnix-88.0

profiles/targets/desktop/package.accept_keywords/mozilla

@@ -1,2 +1 @@
-=mail-client/thunderbird-78.14.0 ~amd64
-=net-libs/nodejs-22.4.1 ~amd64
+<dev-util/cargo-c-0.11.0 ~amd64

profiles/targets/desktop/package.use/pipewire

@@ -0,0 +1 @@
+media-video/pipewire pipewire-alsa sound-server

profiles/targets/desktop/package.use/pyqt6

@@ -1 +1,2 @@
-dev-python/PyQt6 quick qml webchannel
+dev-python/pyqt6 quick qml webchannel
+dev-python/pyqt6-webengine quick

profiles/targets/desktop/packages

@@ -6,7 +6,7 @@ dev-libs/bemenu
 gui-wm/sway
 media-video/mpv
 www-client/firefox
-gui-apps/foot
+x11-terms/ghostty
 
 media-fonts/noto
 media-fonts/noto-emoji

profiles/targets/server/make.defaults

@@ -27,4 +27,5 @@ USE="${USE}
 	lapack
 	vpx
 	lm-sensors
+	opus
 	"

profiles/targets/server/package.accept_keywords/jellyfin

@@ -1 +1 @@
-www-apps/jellyfin ~amd64
+www-apps/jellyfin-bin ~amd64

profiles/targets/server/package.mask

@@ -1,2 +0,0 @@
-# firefox build failure https://bugs.gentoo.org/936013
-=net-libs/nodejs-22.3.0

profiles/targets/server/package.use/libssh

@@ -0,0 +1 @@
+net-libs/libssh static-libs

sys-apps/sau/Manifest

@@ -1,3 +1,3 @@
-DIST sau-1.2.0.tar.gz 9826 BLAKE2B 008e9683e99435d5c812e49ff6b9286d5dc0f4a6097eb56eac28c8ede77bed8ee1bd0382ffc02061ca71b856a03d71685a8f5021e1a8b52c41a2b6c0e57be2b0 SHA512 da38580b2989c04a7edf93d1f6222446e1ad9775e6d337aaf32d0a53019265a30457dc0351f7d18040c0f87bd6707105663d445410a330c41a2232ce2b4c1941
-EBUILD sau-1.2.0.ebuild 646 BLAKE2B 36ebe6dcf3b28d63c214bd903a648c73aa0661f69c8b8557cf8347f34e1a087b23748a38b6eca8ddf9029d85e26a5533e0ff41d153683df173622a8152a879e5 SHA512 416226753408db6406e6ccc96f71ca8c05bd1f3f383f6f39b811a4a2e65fe501e3e66ab29d518f4d29dccc802e977a48c92d340dc65c2f6bcc240b0e362fe213
+DIST sau-1.4.8.tar.gz 11580 BLAKE2B 4cba4557586e0bfe7707ff715f03292777f03ee68f28c67b98775f54a020bde426ca57bdb3457cd82de3256b3da5540eed654fad3e6888e94e024a115a64a3cc SHA512 8606609e9cc1c566ea04086d034e09a09086f1d9ea693c62fdef0e55d569df39faae19c59d7974c9bae3c4bdf48877a0835f04bc3c729609d0d6132f0a72bcbb
+EBUILD sau-1.4.8.ebuild 687 BLAKE2B cc8fd038b9655f0c50302e098c4cc756c8091ccbca865be11ba0b6de3595abfc4447f721b2e9b87404e7ba2ab6f3722ea54b08dc1c851d24311d5a59d45e2bf9 SHA512 349befdd383aa5d380120c29f512e138a40f1bff2e6d1875cbe1c24682de9c5f4c31a916398208063074d4f923b6e9eb01cfd8ff598769c3e961b85156187e16
 EBUILD sau-9999.ebuild 645 BLAKE2B 7625af641139a08799fadf2caafeac921f81dde1773b8c7f047bb31a3c98ef42bf35d862378018b8ea299acf11edcc385817d37f1bcd45f8581b92cc85514168 SHA512 959e853dc4f5694ee511edc5b3ceb58308e9e5cadd46f92dd4c4de140d60ed20fd2106ce81a29e2dd13eda2aa5598743f2ebd9410824ac281410446c20bf1c7a

sys-apps/sau/sau-1.4.8.ebuild

@@ -1,7 +1,7 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{11,12,13} )
 
@@ -20,10 +20,11 @@ else
 fi
 
 
+RESTRICT="mirror"
 LICENSE="BSD"
 SLOT="0"
 IUSE="selinux"
 
 DEPEND="selinux? ( sec-policy/selinux-sau )"
-RDEPEND="${DEPEND} dev-python/psutil"
+RDEPEND="${DEPEND} dev-python/psutil app-portage/gentoolkit"
 BDEPEND=""