gentoo auto-resync : 21:05:2024 - 00:05:35

6 files changed, 28 insertions, 10 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index d35b95ba8db9..39547c32d451 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index cd12a97eca90..094e5eba884c 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,5 +1,5 @@
 DIST neochat-23.08.5.tar.xz 795564 BLAKE2B 1f6dec3376f059e9d70e8be5461719bc74d631a0f98b4d417cd5b8709b4ed1ce9fc48e90a57c8f32889ad2fbf3089f80d9b29a7a73a1944fb54db81f837c4a67 SHA512 936e8112818bc925121d71fcc23d43bc448387af7c8c7857f2ce8b5d128f1acedc9c3c2b6d66e50fb317418cbd144c5262e2fb9e6d80364d48e08e42b27316bf
-DIST neochat-24.02.2.tar.xz 884660 BLAKE2B 38298089b6034f955e0285e13f652750e6593ab8201b8177a77e4fb524c188a1cd73f0254a548daadb564e7cbd42b097dbb26f6c7088971038f1dfcd83e458c7 SHA512 726ae34b6e714f34d4f88070ef3e173cfb2893530e65efdaf294b835ab9c1e1f8c600c6accf6124bd7f509079acacf2e9b36f3b43956ba37b531677f25a4f18c
+DIST neochat-24.04.90.tar.xz 976088 BLAKE2B e812b67bddfe19ca79657eba5aac26942a027bf12e79e94ba7eb4cc35f3cb82844b56affdaa6d928d7d8845e2ae7a043fbfe311497230873550661b2309caa08 SHA512 31be85ab047f18c9b37c5667086f3b3a2190ae4d8ccc1063aebe85ebe3f369ca56b53e2ccb49fdee0bc99337fbb086ed0f35eecd2dcb5046be305eaaf0559750
 EBUILD neochat-23.08.5.ebuild 1602 BLAKE2B 6c61686fd79ae1514e303925ca932a12ab0d1169492409115386058742dabd9eed3c169a06e6efd6b14d0b83600e3477323e3768f7cda03d83f5d604a70eddc8 SHA512 3b377c54606bfbb077cdf937fefce82be8d0e202cffa7cfc500476f923133455c8270695bacb9870e2390470b1d80788c9ee72682f17aacbb2a8434eab05ea67
-EBUILD neochat-24.02.2.ebuild 1717 BLAKE2B 00c2addd494dc1f0c00cd5c53f636a3dae023e31c8679bc4c0f027953a30c52c89195af82c4e754f0c9e2b60f9791218d53fa08366a28dd664b8d721c575156a SHA512 356e6d47a547e2e06f54e3700290034d5063374e69ba1aaa2a3931c8b832d3e9cc219a947a3a7424c279cd006816488a56f2c4d058a1c55a0b040e1597ff048f
+EBUILD neochat-24.04.90.ebuild 1802 BLAKE2B f3c16a53ec654c1cc95528940e4ae7f7df1e9c1a91032e46f7d296d4e0d0d57c6988fdb03722ba40d91d2132683471ab15c3d7826b7817a934e48fcbdf932889 SHA512 ba07013842acdcea74b0aff3daa48a2b07afa5ec20fdffeed50705aab2bad8af4e36c6062562569190793d537ce3f160529238a219e8ca995a02e506ce43e7b4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-im/neochat/neochat-24.02.2.ebuild b/net-im/neochat/neochat-24.04.90.ebuild
index 9e2ad8fc04a0..f147308d800c 100644
--- a/net-im/neochat/neochat-24.02.2.ebuild
+++ b/net-im/neochat/neochat-24.04.90.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
@@ -39,8 +40,10 @@ DEPEND="
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-frameworks/knotifications-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 	>=kde-frameworks/sonnet-${KFMIN}:6[qml]
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
 	media-libs/kquickimageeditor:6
 	>=net-libs/libquotient-0.8.1.2-r1:=[qt6]
 "
@@ -50,7 +53,6 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
 	>=dev-qt/qtpositioning-${QTMIN}:6[qml]
 	>=kde-frameworks/kquickcharts-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
 	>=kde-frameworks/prison-${KFMIN}:6[qml]
 "
 BDEPEND="virtual/pkgconfig"
diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index 9951f0b7268b..fe69ced53013 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,5 +1,5 @@
 DIST tokodon-23.08.5.tar.xz 335920 BLAKE2B 620de13602a8f846c980fc0e57a3c13c73725fca16c2ca7cbcd362d9339a531466f496aa8d4dd0e3f310fd2d87399b34f0c78f74bd9312d2a49190897f92ffd7 SHA512 1f21df479ebe31d2bc891b01fc465f5711445fb1bfefba7a90aec7d9eef304618487f1992cad82f4207928bb7398642db97038817b2aa602e9d77135c216f404
-DIST tokodon-24.02.2.tar.xz 517828 BLAKE2B fd1d07464d44811800136b763e15f8264d8a3ad5140e81b0606bef5eb17420ec831e0c97f2199d88fb579bd5e119743c6d967226800e39f629d5c50a03efa1a8 SHA512 a0af63e1571a80f31823598645cd184797889ecf98cae5ba0663056c2f019d02562430f3026e8aef2553964b33aae459499e26e9b9f6d65b89202ef19baa4bb7
+DIST tokodon-24.04.90.tar.xz 535256 BLAKE2B 752235a41a8cfc5025d7878b67f37c4aa5a23b6f4800af1dba9c0698694130f0cd2733ab6b9afbc8b99868a22a31b1faa5ccf9dc0ed3f331162e4e206d71bdcf SHA512 00af4355319102ad97f878b14e406633408a8e9cad66e5fdfa282ff031a9aefadc926ee2bd8f891c7349a8b415426eda3ce6389069c71c2f46b6e440ba3162f3
 EBUILD tokodon-23.08.5.ebuild 1312 BLAKE2B 299182875ff8260874327aa4e709653392324426100d5ec6d89b34d7c0858c2a8a51cc0b5b8d2c95f811bd038ee81ecc632e2f8878bdcdb2d1dd41af2507e63c SHA512 dae8fb02b73219699ff86a72bd185493e8aab9e1f3ce286f577ab32a42f48a59dd74b9233b0c7e6ae4d8f57a6463749f26badcf36b684ce3cf7973e898f12716
-EBUILD tokodon-24.02.2.ebuild 1312 BLAKE2B a0947e6dae6cada944c4c73510ced9151f68cdd3c4b467b8fa03f55b6732b5f4ffc758384a32b804f87158a3e27998cb4b2f431b2f540b7e7d436a1fe92eb8bb SHA512 c16687f210de914cbef8a6c5896005e63781442dc488998ad818fb3b530cd21766f20dedb37095111ab499c733f7b21d4f951acf3fb96dfad84b045379fffdbc
-MISC metadata.xml 377 BLAKE2B e70a23a324a1d14fbba036ceeeb7e5a974eca12759fee38b1869fd486f2386f4552c5a0172b4c13b937da414b6cf3bb762cea06a553447868d21911c9946b06c SHA512 914e345e6869d9d18210855bb27cc02206e62fcc4917be7968411f9b82d640ac71d40d07f3494a756971cc1412de529cf4b12a9ae47852208dfbe2920d56c3b3
+EBUILD tokodon-24.04.90.ebuild 1672 BLAKE2B f0662d6fcb7fba39982c50baf419f2abb1b34c4de34ae7d172351b5028dc217a38214a12b276ca3901b9b0a125134b2d1988fc9d8ca91eb60a9f57c6605b361c SHA512 ffd04fcd724479ef87ea80c7a48fadfe5919ee770aa99420284449f3aee2461b74d8ba3d893ad60ee716b0cd8825f98cc7d67fe135dbf3fef2caa0710a4d30cc
+MISC metadata.xml 650 BLAKE2B 09307d4f8ef2813b31f884fd04cfbd7cae96784fe2be624a417a60f369554ccee56324f590e2c9bf807849fecf7741c79fad585755e1080233f3884428fdaa98 SHA512 43245fca0e7fee093f8c41672b87593867ad8045547b11f963c2f28d12467b5885418db628c7a50317df97fcb6d1a6f9e8ab88e275a9bac9f3eaa6dbe2848ecc
diff --git a/net-im/tokodon/metadata.xml b/net-im/tokodon/metadata.xml
index 02ce3e9d31e3..0f8aab73a8f4 100644
--- a/net-im/tokodon/metadata.xml
+++ b/net-im/tokodon/metadata.xml
@@ -6,7 +6,11 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="kde-invent">network/tokodon</remote-id>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">network/tokodon</remote-id>
 	</upstream>
+	<use>
+		<flag name="mpv">Use <pkg>media-libs/mpvqt</pkg> instead of <pkg>dev-qt/qtmultimedia</pkg> for video playback (default)</flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for built-in authentication page (default is external browser)</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-im/tokodon/tokodon-24.02.2.ebuild b/net-im/tokodon/tokodon-24.04.90.ebuild
index 20ed8560f79d..e4702950a634 100644
--- a/net-im/tokodon/tokodon-24.02.2.ebuild
+++ b/net-im/tokodon/tokodon-24.04.90.ebuild
@@ -14,15 +14,16 @@ HOMEPAGE="https://apps.kde.org/tokodon/"
 LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+mpv webengine"
 
+# TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc)
 DEPEND="
-	dev-libs/kirigami-addons:6
+	>=dev-libs/kirigami-addons-1.1.0:6
 	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=dev-qt/qtwebsockets-${QTMIN}:6
-	>=dev-qt/qtwebview-${QTMIN}:6
 	>=kde-frameworks/breeze-icons-${KFMIN}:*
 	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
@@ -36,10 +37,21 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/purpose-${KFMIN}:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	media-libs/mpvqt
+	mpv? ( media-libs/mpvqt )
+	!mpv? ( >=dev-qt/qtsvg-${QTMIN}:6 )
+	webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
 "
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-frameworks/sonnet-${KFMIN}:6[qml]
 "
 BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QTMULTIMEDIA=$(usex !mpv)
+		$(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile"
+	)
+
+	ecm_src_configure
+}