Merge updates from master

7 files changed, 151 insertions, 24 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 4d38fec8a941..5ef20998166c 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,4 +1,5 @@
 DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b571128f55c041f2fa1d38f7d22ed0f3ebca2b4ad9faef56d5699a48a70f062d13385c39123185b50ebba3d035d4e5af1320ce1844 SHA512 fc8700f36e3a2e8f07d219f9e7065a97e46d162d8c4f9a576e322dc45470e8b95321a1e176c4739a4fa212a69ff2782049096b32dcfe656a9e9cbedb8c7ed50e
 DIST nextcloud-client-3.13.0.tar.gz 13779791 BLAKE2B a0817a13af27e7fb57bb8a5644654cf3f8a461b7cb4afc71762b7bde5a7611ec57168939c07670d159e54ab11a49e991eda609a855e756d39ecca839a8f79586 SHA512 bf41a63a92e7e970e0b85d6df6e53e6ed8cd2c70fdfdfc86b144b01f82759a05f4bb016fd3009516bb405a589f26f84a8c6cf54191dc906a37d3dddf20dbcfbb
 DIST nextcloud-client-3.13.1.tar.gz 13783306 BLAKE2B 0ac012a612b8c6ba0ec530712393af970afe6a4570078cf87ef991005c9d0481bd68eaf5e39c37a589397af67a3b6ee9c08680c54196de20197bb4d8a854e7b2 SHA512 c78b3ed0a72a7e82028f62529fe00cdd387932d396a402fd3760a8a52bc6083a4b833ca28aea3b35637065de0fe6ca6a4f12c31fbf4b2a560d9001696194ae0b
+DIST nextcloud-client-3.13.2.tar.gz 13782506 BLAKE2B 867ae6ac056bc818d544d22b3a08c8876c093ca75746217822e3111c9de1e8a6b90ba9e0954e0b8c952082ea39f6f732c8914e267b4b1f1d8af3d8ebf6dbd73e SHA512 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6
 DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
new file mode 100644
index 000000000000..7abc2102345e
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
@@ -0,0 +1,116 @@
+# 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
+"
+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 )"
+
+# slot op for qtqui as this package uses private API parts of qtqui
+# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	net-libs/libcloudproviders
+	kde-frameworks/karchive:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	|| ( gnome-base/librsvg media-gfx/inkscape )
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-qt/qttest:5
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+)
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || 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)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-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/www-apps/element/Manifest b/www-apps/element/Manifest
index b794354171a6..4aa2baac9bb9 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,2 +1,3 @@
 DIST element-v1.11.68.tar.gz 24540644 BLAKE2B 6ff0378fc14f14b0808d6c20752498e06cab7e5f7e9c39d9d9f1a49c9404d8c39cf09a26c50212ab5c87ca75599d1d4f8e561a62ad99eeb4e61289944a19e4c9 SHA512 c54dee5ca6270a1ff7134e7720dbcc94e8acdc6b5e75a1b75947febffd8c84c23c38bf6e3b58c24de30f1d3975761a542ba47c74fffb3382095f18c90d1b5f9e
 DIST element-v1.11.69.tar.gz 24572508 BLAKE2B 8e3e2c63d506a0b1e65d8919a72fc7aadb88a609f00e70bbbf3042d0ad9df180210bf011c9d891c4bf1ee115ce8782950bc0d9ba860a22f71978365f9f66745c SHA512 30544bbd9b901def03418f4afa3ad8973f8cf49ae90ef6a68993a7f1f25790d54fdeb8143096eb6ab58f6a159e983bb8686db86707ef821d2d0b82e4c522ed97
+DIST element-v1.11.70.tar.gz 24348915 BLAKE2B 1b4cba2e3f89003e1738923e74f57e2c6d865b44240c87d26e8bfb5c438f3fcb5ce9a5f7970bfc2202121569845cc7ae03829a89b9bcf441b160703d4a172212 SHA512 eacf64488441906eebf2102e6513112e50d4db0a6ebc00afc24059092c525bf71d69956327db0bf0616bbf127697e5e761dc067b81ef49b1d55d44019ab63136
diff --git a/www-apps/element/element-1.11.70.ebuild b/www-apps/element/element-1.11.70.ebuild
new file mode 100644
index 000000000000..33f60473ba0a
--- /dev/null
+++ b/www-apps/element/element-1.11.70.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+S=${WORKDIR}/${PN}-v${PV}
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+need_httpd
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-plugins/pdfjs/Manifest b/www-plugins/pdfjs/Manifest
index 0b920f64b1a0..fce3916492cd 100644
--- a/www-plugins/pdfjs/Manifest
+++ b/www-plugins/pdfjs/Manifest
@@ -1,4 +1,3 @@
 DIST pdfjs-3.9.179.zip 5775197 BLAKE2B 03bbdce1ebeffa025106ce88fcc61bcc523fcac6009cdac39a694a5347cdf63eb2da37a39ea08ca9c3c9e1e3ccf988f17619a14b07d2f8c3c2eac33a43cdabe3 SHA512 85fdcc7839a871a87312d0f006e6d54badf561bfff7bb16463230811cba47d1636e66b3865fb3dd19613444e88e7c1d89a298be04f88f2d1a7c6455df259ff4c
-DIST pdfjs-4.0.269.zip 5781825 BLAKE2B 5ee4fea2eb0ed6c5e97a2135c077abd7747487070a7126be443ebfb5f0fe289e3584edfebf2bfa270daa1397f4ca42bb963b9ed8fe89c7a7c31ae0505f80d7f5 SHA512 68a2a8ddc11e732099c7a79d0bbb6c2db579fdeb96c8335206d5797c662e2bf3fcd257de5909a979e54afa09858b408dfc827360d86deac640199e0980354c12
-DIST pdfjs-4.0.379.zip 5813357 BLAKE2B b0ca37ad0ea4d0859c5a0277592d9f2f1ca0a49bfbd05ccde12e982d6485fe70a4d00ba5608c240a1b482c63f0bf39163fe49a7f833e3192b475af35059a3c73 SHA512 cdab3338b953c800056a26aa94a7b31ae0a67dd9f4725550318d133acbb7eec8dafed55e61cd838fc7f43ba11bfed186395330e7fe36bc0000082baea4ee6b73
 DIST pdfjs-4.3.136.zip 5858710 BLAKE2B 2d1406d018a0dee20dd4d85a00aa0bb6940daf13cd573a7477d06005aa0b98ab25bf7d9ec04c7a319d6c676897c7a3a3b09a2108da735df1f24e47fcd586f4d0 SHA512 3a12250fb0b4b5131b8ccc7cc7df47fc6befc3fdc2bf49ac3b62b8f1a3a9466e460277bb7fa23cbf587755cf31523d7644054edc5d7576fd453bc473aa30bc67
+DIST pdfjs-4.4.168.zip 5878424 BLAKE2B 3f79b714a510e1c656a67741ed0eaeac5e81f561d643daee33ec1f54f68e09449e44d6a2a6401b5db8a8a4dd21ccf31fbd0c4aacc3718d110628c7b245631b16 SHA512 3c407b5b6fafc6b02485342a6456dde06f95a91b3b7ebe24be0bcff2529e4c7c8331462a97b1dd69416cb44ec0b089f69aa408b06a38570f4465bb380d327f26
diff --git a/www-plugins/pdfjs/pdfjs-4.0.269.ebuild b/www-plugins/pdfjs/pdfjs-4.0.269.ebuild
deleted file mode 100644
index 7d2127ad585d..000000000000
--- a/www-plugins/pdfjs/pdfjs-4.0.269.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A PDF reader in JavaScript"
-HOMEPAGE="https://mozilla.github.io/pdf.js/"
-SRC_URI="https://github.com/mozilla/pdf.js/releases/download/v${PV}/${P}-dist.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	insinto /usr/share/pdf.js/
-
-	doins -r build
-	doins -r web
-}
diff --git a/www-plugins/pdfjs/pdfjs-4.0.379.ebuild b/www-plugins/pdfjs/pdfjs-4.4.168.ebuild
index a7c66a412285..a7c66a412285 100644
--- a/www-plugins/pdfjs/pdfjs-4.0.379.ebuild
+++ b/www-plugins/pdfjs/pdfjs-4.4.168.ebuild