gentoo auto-resync : 17:07:2024 - 12:28:31

16 files changed, 133 insertions, 797 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 23cffef8bce9..c187bce842f9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index f616f0fcce23..165fa9a44087 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,23 +3,15 @@ AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23
 AUX freerdp-2.11.7-type-mismatch.patch 758 BLAKE2B 3841272554c8b5e3bbd6a94fe00c8a9d429a3ef82f1723ff27a15c23d1be91bc3ec5bc1a9cc7a87911e3d690f2e53a6b46f65a77a5c3f738a585544b512e5743 SHA512 49e5b67904cb84b658c28cf98845b152c4421d506440e8efe04a388aa72d22dee5e41350f2acfeebd0bfc859ff8bc6a2aa654fabecadede3d8fc9166420de2e7
 AUX freerdp-3.4.0-incompatible-pointer.patch 10251 BLAKE2B 70a23022ff8db7dcf0ada3bf2165d6b271f259f4a49b40d4ca2c2de75e5321156cbedcca77240663e143986073d5a49e74b2b6caf456a6136d83673becf6c35e SHA512 c44165fc843742d1cb5859f24c6eaa78cda13837315ca3fde48092835992998701a670a66cf351c406153a65166050b5523e432789b5b6e2151227ea43ef034d
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
-DIST freerdp-2.11.6.tar.gz 7337387 BLAKE2B 6d6b338710fccc4ad5067f4cf7f17190409f5313cb0c2c4ad84c82326b605897e01e03e2f334346ae5e20642c7813b415d0123558c00565b4b8c11257ebac226 SHA512 4facaff07bc26434474776e2463c9ebf0111190cb6bcf7d3dc7a6b3d8e2de991925a92b7889b2c5dec50ee4cf28f94bb1016c36da207a00ead09005ea0ace36d
-DIST freerdp-2.11.6.tar.gz.asc 228 BLAKE2B cfcd673da04fcd749883b5dbbc27f12d6680442991d884006401521222385c7b325af35828683d96e1de866850a9c4eaae5f26d4b3cff4111391dc31f94ca1bd SHA512 4ef9a1fcb6f97295affbe080657a5a812d73e3448e1f480b382774e6f6fd3276a4e251e94cac66fdc83ae974ccc0b9ca9ca2b82b76b5128915885a35fafd18e4
 DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e
 DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76
 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
-DIST freerdp-3.5.0.tar.gz 9335565 BLAKE2B fc417336cda9dd14a2c7605a2b0172220f711599356b38d4d346130fc865c1ef563e627b57bcb20843dae231d8cfda272261db30d956ea98c29ebf7908c4722c SHA512 5f6f6fc84d0fb3581b3debd8dde8ed7054275af46f71b6ebd618d240b196e26352cf5ea260bd819a2b4464101012184910715b546701a95fc1aa951433150b07
-DIST freerdp-3.5.1.tar.gz 9338947 BLAKE2B dd004333a52046300a5f319346da46ddb460e8acbb5902dc4daa18e3d0b6e3d9ee1d43f43e54f0887fec68cf6a952567be4c7995e807099585b9062a56058506 SHA512 6c7861131e1ae2cf824659fe8cff34e0f608c4e3796b64f02a61aeeaa12dce76aad2bfa5096c821f0f86fde82ffed7e4876f20cd4016ea1adb7555e4828551d8
-DIST freerdp-3.5.1.tar.gz.asc 228 BLAKE2B ae5826e539f0078d3adf7a4886f0b0c249c73fd2fc7ae21dcf815d876ec26f4482c242c076dbd9dcadd18927f4f97199f16fac3b40c0c04b1e43482865af15dc SHA512 ba52d6a5aa3d91fdab988d91b8591ccb075ce3d52bbee0596ffdb50902b54e650b397995f273463296a484199b969bab47708b5dbfc76c4128aa54ec5afcfdf2
-DIST freerdp-3.6.2.tar.gz 10195789 BLAKE2B 42e8337f8be0345bd182e46354b9ccd4b1a241679834d82e567e80576f69c7b09e5e4c548ff4e4386bdba3a8d44fd1b5c63932d720f7ed22ab70f6f2e0f254a4 SHA512 c0f4d85c3e90158dbd966363d4e78a32c56c8cbedd1520dd1a517cd392a811644073760dcaeb2668f00a92febd3c74fd8e2f26447bbe76069e6a6fdba9a67d2c
-DIST freerdp-3.6.2.tar.gz.asc 228 BLAKE2B fbf27c8804329abaf9eb844caac8ef69c48cf6982ac92cd5a0f8191347439aae69d4ad9e5d014f6ab0ba5521d103fdcdfe00de5ff603e632a5518b4e29cca3dd SHA512 4e0c86355112c603627edb802e61444d9c35b4b12a89300073a4e46c093a3fe2011a9e0774c4b493b8289f9e06c46d8bca381bdcd80c9c40d1bbe5e2516fbdfc
+DIST freerdp-3.6.3.tar.gz 10199503 BLAKE2B ff4c76a7f2d808db09d22b6cf79caaa1f1aff58c25d37d853d4244cf4b8d0f522cb3ad384c6284544a08e2092277e7b4ee8a6f9fa61bb24319d7c5d08aebfdc7 SHA512 e92b839bdaaed99f05c3ab883a864fb3a18a01b5e173317b1cf8210ad16cbf25f2133b8893dec9f9d3a92b0a2fbcb0230f549e1632ade0394b5c8ea0f7331e1e
+DIST freerdp-3.6.3.tar.gz.asc 228 BLAKE2B 4ea04f0d662afef34d61f06d36f3bd6f872f2a7cd8095df581f489306d88a761921a0a93325bdd4c5a627a1c47c612652697b9dc3338ebe0ea952a65b0783cc7 SHA512 6568362c2ad1032925e7dfcd04977c56a58e661b8eacc79d6d2ad77bb9e56d3dff3f13d004d50a88827aa9ccbd2f56c1019a53e18bf35856dbec81acba1dc142
 EBUILD freerdp-2.11.5-r10.ebuild 3675 BLAKE2B 81ed6fb24d6bdd2ca894b2368e47adc29996441fa251ab5e4fa5d45128027a446c83f733dc9c010c6701e4b42bec15d987381bc3d72a234563c021552fd18a7e SHA512 910dad20fca8dbd8a287b31769f71fb2f660f4001df1b013e1340e19898fe2fd950765517faea66ecb9b8488b7bd1e87595813dccde3749a76f91b92b6a5b4e8
-EBUILD freerdp-2.11.6.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f
-EBUILD freerdp-2.11.7.ebuild 4065 BLAKE2B b99f1e776a8928a2300d7e0a5efbbd6b67ca8070125779cda0a90105f08c348008ceb240a483fd5b9554b7be69085da9f119d300174cc91bec5812466096f4b4 SHA512 13eda5a622d3cf79a3a36357ebb88235983d87dae7aa15b0d9744563b1d44a4897d1d1fc99fad1a38a3d8c4c368cf3fb174f6ac8babfa7522123a08b57ded1b8
+EBUILD freerdp-2.11.7.ebuild 4059 BLAKE2B f104ca6d06a417cc3e5930fe85eadbf9fa10c61bb52e544daeaaf3316c216ba6363b0b1d3d1a0b79455fe9613831748901f0edce28f5d2df9cca8abffdd349a3 SHA512 fe9ebbcacf18cb59d16458c5cfe47cf15fe89150ebfeca176b6d288b96112ef0965e517171f87c16e62590eee8b3a6a106fe2ba87062061e98dd36f33671b18a
 EBUILD freerdp-2.9999.ebuild 4014 BLAKE2B 8e16a4c7dc35301402fbae5da1ba9da5673f0b5c4d8da811e5671f91816265a7dad92b5ae69533f44c084cec371962eac4499a0bb7ce98665336abf3ddaa730e SHA512 7ca53326d24353a2e1bc2d5c006c6a0866c98363d11ab231ff1c086119545979019ad9e13d9e40d4903bb020f4b891a041c0c93edfd566def19296b870e968fc
-EBUILD freerdp-3.4.0-r11.ebuild 4170 BLAKE2B d0c489ddda31ec18c760f17f151cf1381ff9ad018b33d8246a4e7231f98298d8a7083e91be321d75d263f58e0b6e4fc3a71f029f3cf4b8c88d2ef4d7b45f5262 SHA512 da6d233a7bb1ef6aa31a6457dce467aab9abb22f73a3f480825c16bfc3be25501635baf9849ef5e5de2771908adf6a9d89f40d9d6f83b843f32a5e972f52acd8
-EBUILD freerdp-3.5.0.ebuild 4061 BLAKE2B db81f0a4e3e724a56f8a751a8ea75157ddf1bb2084bbcbb0d7cb79c1303943841eb25b47062f873ca37c0c653b5fdaea945aee0679f881e23b3ea3c5aaaaceb9 SHA512 c39ca3be52c6a180268384108dfa908dfdc912988b2b1e6dc4aeb13b53beebca02745898106afb3bde52035d3f78bf752b69ebcec8bdc28527d3540be13ca6af
-EBUILD freerdp-3.5.1.ebuild 4282 BLAKE2B 7df61eb651420605019dd8fd67569194f57aeb3ac79b2a9632812a8f3f537bcac7a7e6457c3bbe35f187b73348aa88f6e6fe749c5e90895d5c15669b2ecb3e6f SHA512 c04f62608dcf2f511468175b7f1fb8eb83174acd61f3a11862751176900b232ebc1bc80d947d07dd513b3570ab6542a5bb1f8a9bb28906af5e61274f1a5227d2
-EBUILD freerdp-3.6.2.ebuild 4282 BLAKE2B 7df61eb651420605019dd8fd67569194f57aeb3ac79b2a9632812a8f3f537bcac7a7e6457c3bbe35f187b73348aa88f6e6fe749c5e90895d5c15669b2ecb3e6f SHA512 c04f62608dcf2f511468175b7f1fb8eb83174acd61f3a11862751176900b232ebc1bc80d947d07dd513b3570ab6542a5bb1f8a9bb28906af5e61274f1a5227d2
-EBUILD freerdp-9999.ebuild 4282 BLAKE2B 7df61eb651420605019dd8fd67569194f57aeb3ac79b2a9632812a8f3f537bcac7a7e6457c3bbe35f187b73348aa88f6e6fe749c5e90895d5c15669b2ecb3e6f SHA512 c04f62608dcf2f511468175b7f1fb8eb83174acd61f3a11862751176900b232ebc1bc80d947d07dd513b3570ab6542a5bb1f8a9bb28906af5e61274f1a5227d2
+EBUILD freerdp-3.4.0-r12.ebuild 4202 BLAKE2B 5f55807ba41422d61497b7ee08a0b150ad41a92ea50a83c9d1aaac06700b1b7b99927c651a9e861860935bb0643174be983e09e2b9f07e5cf99bb3c75016d2b1 SHA512 6a3029a833773ae2e30da1510d4a7d0b185cc300d1c53c164ae8da5f63b3fd63d2a0bc90616546b0ce45f162eda34b907230392267facb948123ea3ef60d21a2
+EBUILD freerdp-3.6.3.ebuild 4283 BLAKE2B 20357f723d89b13d6b4338a14bb783b8615be3b8b47248b2c8c1fb5961e3a1006aa1322ab7a55bec8d745fb61a8e0738ace694d8168c66bf7425318b0504b963 SHA512 dd71a8c9b37d32df03afb619f0bdfb261cc8b31e59d869fcc97f3d7ba6d09df8caff0b6bb5d427d6b6cd58a020de3f3412c5fdd3b29562b1b9180451036247b5
+EBUILD freerdp-9999.ebuild 4288 BLAKE2B 46b1483dc049b9a791bc35d29a8c411a5d9a3c9efb0768ccfa51b9f95fb050815611fc25339f55797ca605a0bf0f9cdea27bac61ee532c6e88932068b8a8c237 SHA512 284f977053213df5d2ca5f7e1e778a513a38e0c37e853133ec3f7a1520940f742ab9112d8383190cb2fd17d5f3cc7a08b88cd9efb199746db069a8a54c7eb517
 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae
diff --git a/net-misc/freerdp/freerdp-2.11.6.ebuild b/net-misc/freerdp/freerdp-2.11.6.ebuild
deleted file mode 100644
index 2a7209cfab84..000000000000
--- a/net-misc/freerdp/freerdp-2.11.6.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	inherit verify-sig
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
-		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-BDEPEND+="
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-"
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		X? ( x11-libs/libXrandr )
-	)
-	icu? ( dev-libs/icu:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	client? (
-		wayland? (
-			dev-libs/wayland
-			x11-libs/libxkbcommon
-		)
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/freerdp:0
-	client? ( !net-misc/freerdp:3[client] )
-	server? ( !net-misc/freerdp:3[server] )
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/freerdp-2.11.2-clang.patch"
-		"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
-	)
-	cmake_src_prepare
-}
-
-option() {
-	usex "$1" ON OFF
-}
-
-option_client() {
-	if use client; then
-		option "$1"
-	else
-		echo OFF
-	fi
-}
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DBUILD_TESTING=$(option test)
-		-DCHANNEL_URBDRC=$(option usb)
-		-DWITH_ALSA=$(option alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(option cups)
-		-DWITH_CLIENT=$(option client)
-		-DWITH_DEBUG_ALL=$(option debug)
-		-DWITH_MANPAGES=ON
-		-DWITH_FFMPEG=$(option ffmpeg)
-		-DWITH_SWSCALE=$(option ffmpeg)
-		-DWITH_CAIRO=$(option !ffmpeg)
-		-DWITH_DSP_FFMPEG=$(option ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(option gstreamer)
-		-DWITH_ICU=$(option icu)
-		-DWITH_JPEG=$(option jpeg)
-		-DWITH_GSSAPI=$(option kerberos)
-		-DWITH_NEON=$(option cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(option openh264)
-		-DWITH_OSS=OFF
-		-DWITH_PULSE=$(option pulseaudio)
-		-DWITH_SERVER=$(option server)
-		-DWITH_PCSC=$(option smartcard)
-		-DWITH_LIBSYSTEMD=$(option systemd)
-		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
-		-DWITH_X11=$(option X)
-		-DWITH_XINERAMA=$(option xinerama)
-		-DWITH_XV=$(option xv)
-		-DWITH_WAYLAND=$(option_client wayland)
-		-DWITH_WINPR_TOOLS=$(option server)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=( -E TestBacktrace )
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die
-}
diff --git a/net-misc/freerdp/freerdp-2.11.7.ebuild b/net-misc/freerdp/freerdp-2.11.7.ebuild
index 966ad5d7d626..399900dc6899 100644
--- a/net-misc/freerdp/freerdp-2.11.7.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.7.ebuild
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
 		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
 fi
diff --git a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild b/net-misc/freerdp/freerdp-3.4.0-r12.ebuild
index a616aab29951..eff1b1ea29b2 100644
--- a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
+++ b/net-misc/freerdp/freerdp-3.4.0-r12.ebuild
@@ -104,6 +104,7 @@ RDEPEND="${COMMON_DEPEND}
 	!net-misc/freerdp:0
 	client? ( !net-misc/freerdp:2[client] )
 	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( dev-libs/opensc )
 "
 
 src_prepare() {
diff --git a/net-misc/freerdp/freerdp-3.5.0.ebuild b/net-misc/freerdp/freerdp-3.5.0.ebuild
deleted file mode 100644
index 78789fee28fc..000000000000
--- a/net-misc/freerdp/freerdp-3.5.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	aad? ( dev-libs/cJSON )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	fuse? ( sys-fs/fuse:3 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		X? ( x11-libs/libXrandr )
-	)
-	icu? ( dev-libs/icu:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? (
-		media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
-		media-libs/sdl2-ttf
-	)
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? (
-		dev-libs/pkcs11-helper
-		sys-apps/pcsc-lite
-	)
-	systemd? ( sys-apps/systemd:0= )
-	client? (
-		wayland? (
-			dev-libs/wayland
-			x11-libs/libxkbcommon
-		)
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/freerdp:0
-	client? ( !net-misc/freerdp:2[client] )
-	server? ( !net-misc/freerdp:2[server] )
-"
-
-option() {
-	usex "$1" ON OFF
-}
-
-option_client() {
-	if use client; then
-		option "$1"
-	else
-		echo OFF
-	fi
-}
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-Wno-dev
-
-		# https://bugs.gentoo.org/927037
-		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
-
-		-DBUILD_TESTING=$(option test)
-		-DCHANNEL_URBDRC=$(option usb)
-		-DWITH_AAD=$(option aad)
-		-DWITH_ALSA=$(option alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(option client)
-		-DWITH_CLIENT_SDL=$(option sdl)
-		-DWITH_SAMPLE=OFF
-		-DWITH_CUPS=$(option cups)
-		-DWITH_DEBUG_ALL=$(option debug)
-		-DWITH_MANPAGES=ON
-		-DWITH_FFMPEG=$(option ffmpeg)
-		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
-		-DWITH_SWSCALE=$(option ffmpeg)
-		-DWITH_CAIRO=$(option !ffmpeg)
-		-DWITH_DSP_FFMPEG=$(option ffmpeg)
-		-DWITH_FUSE=$(option fuse)
-		-DWITH_GSTREAMER_1_0=$(option gstreamer)
-		-DWITH_JPEG=$(option jpeg)
-		-DWITH_KRB5=$(option kerberos)
-		-DWITH_NEON=$(option cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(option openh264)
-		-DWITH_OSS=OFF
-		-DWITH_PCSC=$(option smartcard)
-		-DWITH_PKCS11=$(option smartcard)
-		-DWITH_PULSE=$(option pulseaudio)
-		-DWITH_SERVER=$(option server)
-		-DWITH_LIBSYSTEMD=$(option systemd)
-		-DWITH_UNICODE_BUILTIN=$(option !icu)
-		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
-		-DWITH_X11=$(option X)
-		-DWITH_XINERAMA=$(option xinerama)
-		-DWITH_XV=$(option xv)
-		-DWITH_WAYLAND=$(option_client wayland)
-		-DWITH_WEBVIEW=OFF
-		-DWITH_WINPR_TOOLS=$(option server)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=( -E TestBacktrace )
-	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
-}
diff --git a/net-misc/freerdp/freerdp-3.5.1.ebuild b/net-misc/freerdp/freerdp-3.5.1.ebuild
deleted file mode 100644
index 0c7ce6eacd22..000000000000
--- a/net-misc/freerdp/freerdp-3.5.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	inherit verify-sig
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
-		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-BDEPEND+="
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	aad? ( dev-libs/cJSON )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	fuse? ( sys-fs/fuse:3 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		X? ( x11-libs/libXrandr )
-	)
-	icu? ( dev-libs/icu:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? (
-		media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
-		media-libs/sdl2-ttf
-	)
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? (
-		dev-libs/pkcs11-helper
-		sys-apps/pcsc-lite
-	)
-	systemd? ( sys-apps/systemd:0= )
-	client? (
-		wayland? (
-			dev-libs/wayland
-			x11-libs/libxkbcommon
-		)
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/freerdp:0
-	client? ( !net-misc/freerdp:2[client] )
-	server? ( !net-misc/freerdp:2[server] )
-"
-
-option() {
-	usex "$1" ON OFF
-}
-
-option_client() {
-	if use client; then
-		option "$1"
-	else
-		echo OFF
-	fi
-}
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-Wno-dev
-
-		# https://bugs.gentoo.org/927037
-		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
-
-		-DBUILD_TESTING=$(option test)
-		-DCHANNEL_URBDRC=$(option usb)
-		-DWITH_AAD=$(option aad)
-		-DWITH_ALSA=$(option alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(option client)
-		-DWITH_CLIENT_SDL=$(option sdl)
-		-DWITH_SAMPLE=OFF
-		-DWITH_CUPS=$(option cups)
-		-DWITH_DEBUG_ALL=$(option debug)
-		-DWITH_MANPAGES=ON
-		-DWITH_FFMPEG=$(option ffmpeg)
-		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
-		-DWITH_SWSCALE=$(option ffmpeg)
-		-DWITH_CAIRO=$(option !ffmpeg)
-		-DWITH_DSP_FFMPEG=$(option ffmpeg)
-		-DWITH_FUSE=$(option fuse)
-		-DWITH_GSTREAMER_1_0=$(option gstreamer)
-		-DWITH_JPEG=$(option jpeg)
-		-DWITH_KRB5=$(option kerberos)
-		-DWITH_NEON=$(option cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(option openh264)
-		-DWITH_OSS=OFF
-		-DWITH_PCSC=$(option smartcard)
-		-DWITH_PKCS11=$(option smartcard)
-		-DWITH_PULSE=$(option pulseaudio)
-		-DWITH_SERVER=$(option server)
-		-DWITH_LIBSYSTEMD=$(option systemd)
-		-DWITH_UNICODE_BUILTIN=$(option !icu)
-		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
-		-DWITH_X11=$(option X)
-		-DWITH_XINERAMA=$(option xinerama)
-		-DWITH_XV=$(option xv)
-		-DWITH_WAYLAND=$(option_client wayland)
-		-DWITH_WEBVIEW=OFF
-		-DWITH_WINPR_TOOLS=$(option server)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=( -E TestBacktrace )
-	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
-}
diff --git a/net-misc/freerdp/freerdp-3.6.2.ebuild b/net-misc/freerdp/freerdp-3.6.3.ebuild
index 0c7ce6eacd22..54782cebb998 100644
--- a/net-misc/freerdp/freerdp-3.6.2.ebuild
+++ b/net-misc/freerdp/freerdp-3.6.3.ebuild
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
 		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
 fi
@@ -85,10 +85,7 @@ COMMON_DEPEND="
 			xinerama? ( x11-libs/libXinerama )
 		)
 	)
-	smartcard? (
-		dev-libs/pkcs11-helper
-		sys-apps/pcsc-lite
-	)
+	smartcard? ( sys-apps/pcsc-lite )
 	systemd? ( sys-apps/systemd:0= )
 	client? (
 		wayland? (
@@ -108,6 +105,7 @@ RDEPEND="${COMMON_DEPEND}
 	!net-misc/freerdp:0
 	client? ( !net-misc/freerdp:2[client] )
 	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( app-crypt/p11-kit )
 "
 
 option() {
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 0c7ce6eacd22..51aab209a2db 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -85,10 +85,7 @@ COMMON_DEPEND="
 			xinerama? ( x11-libs/libXinerama )
 		)
 	)
-	smartcard? (
-		dev-libs/pkcs11-helper
-		sys-apps/pcsc-lite
-	)
+	smartcard? ( sys-apps/pcsc-lite )
 	systemd? ( sys-apps/systemd:0= )
 	client? (
 		wayland? (
@@ -108,6 +105,7 @@ RDEPEND="${COMMON_DEPEND}
 	!net-misc/freerdp:0
 	client? ( !net-misc/freerdp:2[client] )
 	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( app-crypt/p11-kit )
 "
 
 option() {
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 574cc572b68a..66e29c2267a9 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,12 +1,9 @@
+AUX nextcloud-client-3.13.2-fix_build_kf6.patch 1249 BLAKE2B d7dc92c12e2c952519cbba96ff557ef46bb98172805304c64744d1c7c7ba0fb30d0f665af0f750021781c1284afa3cd0eff29717d274e38565bcbc72c439c616 SHA512 a1685627081c2d362eb51cc2192cdfbc25609a384d0ea219807297504410a3633384504c2091783d07bd3f88d938e742e04f0089c6d38f467565117d7bb11ab7
 AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 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
 EBUILD nextcloud-client-3.11.1.ebuild 2749 BLAKE2B 2365c6846ceda8e2acda8dabeaf6d7d3283133027baaf021e1d83e165d6d3188f6bf93768ca0d7bf599b10db4d3d26b8c3ebb577b6c53a7ef1c3bf4bec3cf22f SHA512 98c9ae0a2c2b35a0cd48ff4aa12050babeecf21a3c668476f2d2a8b0024a64e4e2838e1765e2929bb7bd8fa311c374da3b2c3b11464dc24bad1689df672baf67
-EBUILD nextcloud-client-3.13.0.ebuild 2765 BLAKE2B 27362ab34eae0c143332ae341a13dbfa194f71a43e9ddf9a928eb823bd4fca2c2bbce8a177a0bd77b28e2ece43401de0d90e50b4cd0027607d4c8f115e32b5b3 SHA512 3f68d7155dd026f9f00886f50c70cfd8b227c24f7ee35f622629f86870b2c98bd9b3292b031be13f25ff70bf5bdd210dde77d275b2420631210d5556e8793bb6
-EBUILD nextcloud-client-3.13.1.ebuild 2774 BLAKE2B df1d531ef33a79a997d8b2b5faf25c6cc8bacb7f85c9aeba384a25276aacc42f95cc976b4257036e7143b76086fe007868d261541aecdbba1805de36b823f443 SHA512 45c9653e599ed1ad563d8c2bcecbed38d66b31cd4d47b14b3b6b516e895d1922071e38af132c31d2d4bf3fed9670cbca219283f2476830db4fcace5b9e3965f1
-EBUILD nextcloud-client-3.13.2.ebuild 2774 BLAKE2B df1d531ef33a79a997d8b2b5faf25c6cc8bacb7f85c9aeba384a25276aacc42f95cc976b4257036e7143b76086fe007868d261541aecdbba1805de36b823f443 SHA512 45c9653e599ed1ad563d8c2bcecbed38d66b31cd4d47b14b3b6b516e895d1922071e38af132c31d2d4bf3fed9670cbca219283f2476830db4fcace5b9e3965f1
+EBUILD nextcloud-client-3.13.2.ebuild 2822 BLAKE2B 38b39edcbf78370524c9f6a000d61a92dd21d1b49d844ce59925ef34ad93cc61fd4b3c91871163b642072eed8b2c6874314e7899d8ce5fecb026a2b1d913c20b SHA512 aea13b2864a93f812e6f2a54471718dc0638005bab2dfb732d279535c5f8d6e39c8fe0a3e1d7146e7da9955d8d7b8b35693c941c3c8e9ca7ff2fd65fc75f043f
 EBUILD nextcloud-client-3.9.4.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
new file mode 100644
index 000000000000..3898dcbcef3c
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
@@ -0,0 +1,38 @@
+From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 1 Apr 2024 20:00:25 +0200
+Subject: [PATCH] Fix build with KF6
+
+Set QT_NO_CREATE_VERSIONLESS_FUNCTIONS, otherwise Qt5 and Qt6 conflict
+
+Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
+---
+ CMakeLists.txt         | 1 +
+ src/gui/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 687733588813..07d3266cb9dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ endif()
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED 17)
++set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON)
+ 
+ include(FeatureSummary)
+ 
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 6e4acf203d19..37f459db4384 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -58,7 +58,7 @@ set(client_UI_SRCS
+ if(QUICK_COMPILER)
+     qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
+ else()
+-    qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
++    qt5_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
+ endif()
+ 
+ set(client_SRCS
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild
deleted file mode 100644
index 0812c7b1c004..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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
-	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/net-misc/nextcloud-client/nextcloud-client-3.13.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.1.ebuild
deleted file mode 100644
index 7abc2102345e..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
index 7abc2102345e..151c9bcdf637 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
@@ -67,6 +67,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+	"${FILESDIR}"/${PN}-3.13.2-fix_build_kf6.patch
 )
 
 src_prepare() {
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index b3c2fed6e75f..15a779d0f999 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,6 +1,8 @@
 DIST yt-dlp-2024.07.07.tar.gz 5687365 BLAKE2B 877b8bd15d7650b0afa928f44bac587843d1e37b8f26b82a64af9171525a26f89930b40f5f24e8c81833220bf78da4669bea0e4a660211a673e6209e9e062f07 SHA512 f6cb892db1364ccce2c2f99c5b0cb859475cd7757c93f03e1059c8222aadf2fd2220c6ea3509334a16439858274bbeb889dce52d7a9158043d6de473d5346598
 DIST yt-dlp-2024.07.09.tar.gz 5689089 BLAKE2B c5f6c17b68ad1816af5c1ae480afd9ba6300a7b588d44a86d780433f147dbf12a1598c4940907277d9fcbd3d924616460c1ea98b8b84ebe06c09ec5703b8b158 SHA512 8abfe3a70ae0758a001274b07523647cdf0f4e760eb98867577b1ac6306bbebd0f8ddee93de2782da2a19b9476e120e571b4638c07b93ffbfc060822d4ff126f
+DIST yt-dlp-2024.07.16.tar.gz 5688157 BLAKE2B a1e4cd8ff7b73246aed2239298d548945c99fe8d76d41b9e3293767b7b680028f4d23f2fc116516e853be163b267a600f99525784d9b3cc16280f1b8b2d5a90a SHA512 17f5aa71ae01b6a009e5b0a4380d9329530563ee01ac268a2a6acff01732ce0c9d14181790a15b182b0de09a35b6db2f3e814acc50934d5f3e361245027926e9
 EBUILD yt-dlp-2024.07.07.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
 EBUILD yt-dlp-2024.07.09.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
+EBUILD yt-dlp-2024.07.16.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
 EBUILD yt-dlp-9999.ebuild 2436 BLAKE2B 3be5da21d8b1ffef30cb8c204121d7c7ce59ca12d0e369ce6c232dba59a1cf8c057c7f6b09b6bca4289533f04db6075c72843d5154221b0c8f18dd6cea809d4f SHA512 c83a141c85ac1fb1091525f6f3b7600d3fc9132b2a4cff39f5460fb2c20c5d9094e2176450cdcde24b05877c2306462045929ea6e3690d9d48012e234a8381ca
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild b/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild
new file mode 100644
index 000000000000..68214ba4c2eb
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="
+	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# adjust pycryptodome and drop optional dependencies (bug #828466)
+	sed -Ei pyproject.toml \
+		-e 's/("pycryptodome)x/\1/' \
+		-e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fails with FEATURES=network-sandbox
+		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
+		# fails with FEATURES=distcc, bug #915614
+		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
+	)
+
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}