10 files changed, 117 insertions, 609 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 50aed229a4ac..57e0dd2e10c0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 1722b9900beb..a0ad64b9b1a9 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -2,10 +2,6 @@ AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d94863
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff8289f477e1c4b019f2a854d33022a171d7f16e2b8193c94964806542560e00fbf54e63deea9038845201120aa8 SHA512 c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e
 DIST connman-1.42.tar.gz 743965 BLAKE2B 1d9eeb4c917978df502de684128a3464bbc7f3960878842a3ac27295dc5d049641cd5218a9542055b5d9ab2b6114fb773fc8a173f54dca3afe37109ab58bde35 SHA512 98ede28854e5948c8b67c5ba03b156ed9966e9fcda2d39168062873b194a192d12af885c63d9a2cb0b7b5b882b69fdbb0e09c4eb0c6772a76db06de7b9e363d7
-DIST connman-24180d1243bf005c721be6f9d8d6da67bb669c55.tar.gz 744924 BLAKE2B 87b1b1dc09c483fb69d75c5c43b89492b32d0e0357fb25208c369a446f85641e5e364ce3bd21f0e43c95e06a8578f28dea4b26decb8a0ebf591bf4c44616645f SHA512 dd6eb7684aeac7a07c504de018b6efda2ceab4ff3b66e4942bf8d8a37e1feee609a63a5b9fa73ce3b3582b6949ea3399f8740bcb7dc39885d239610d3b280d0c
-DIST connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz 743500 BLAKE2B 513380639f02c103f4e9aca73571e00edc42894e612712c20319c3ee9b8845bff41ce05b17016b52b7d34f09c8f74f877a639fd21455b13a5a2ef1554eb0b093 SHA512 bc37dabb13b76e3fa0efd811d664f321b47118d378285dfa06710ec227822c409ed0c60c2f42c00ae081e47ec879ec1b19f784e9fc2346d1d57f6e87550dda22
 EBUILD connman-1.42.ebuild 3508 BLAKE2B 10e1bc360fa9a17a454302e30cdd601333aa33ab8d53f9cef1124c7063828892d292e18ad66ce60cfad926ce45fe7f50f0e45b2caa7b615dfdde13a5dd1152b3 SHA512 28ed3c6136d59153b5542bd2ee7d57b8ae2a7cbda635c0beac121edec61fcb3fc90d4eea90b4bc026ab41b2e07f2a0f0a250f9ed5a7fe49c511c513e432ef841
-EBUILD connman-1.42_pre20230116-r2.ebuild 3570 BLAKE2B eb090ff16da8122c317af57b906e4e6b01879efb113f8dbcb9095bca7449f6e137deb7fd89af45416800149a3a9e1fdebce10ecf9ee4edc02aabd0deffbd70d1 SHA512 bca0b48231be5bb11d8ce274c5935d5fa294b1679a828e2f61011e9a40844ddf30b8309f51f51568f1383f1b1158c9eaf271cc1b7ae4408270e2c19ecb9c6149
-EBUILD connman-1.42_pre20230411.ebuild 3570 BLAKE2B 0941ac7ac13329211d67df6c81826c9cdf278951adad8193ce27f7c963e2564fe6606522d9e5d2e7c358288de6e10f1159d62ebcf4f6a02e396d435a5ecaffa9 SHA512 bcae6eeb9d00040894586ffdbb26b29acdd438823e9f24ef13988982c251c81f5c98b996831c7d99e617908786fa269f3dfadc6b604610c494c995af3a1130b5
 EBUILD connman-9999.ebuild 3532 BLAKE2B 1af7dd81bb71adb568072d0b2e817c99b96fa2b2fea6be7a35ddface9169564787b9a79fa8f4fce64612b4d3e1efcd4c6aa92f064e9a521e3eb2d251790337ed SHA512 c6da057d5c9a3bee4b203c9c5c3bbcdca8f5f5d0d44ffb4cb3674ddeb317474a89e980fd2248c3ffdfff758ad0957ae9003f6468b49334bd508241cecd708761
 MISC metadata.xml 1314 BLAKE2B 8ac27df91b77d2da814c0f35368359f2c55c9cf9c9b8db56748ca9a6128f59514dbcba5c966777a1dda27ed37ccdc6e7e37b57724f7bac83e383c3f8e5b427ce SHA512 98dcfc78d0d4a7abab5282efc2cd10419ab067d6f52f9743f7b72dc446f6e0cc0c5a63266ffa3b9cdb4df3935fc5e7f96faa143bf796ccd90e709c26e7a652b7
diff --git a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
deleted file mode 100644
index 9d426a8103da..000000000000
--- a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-inherit autotools systemd tmpfiles
-
-COMMIT=9971144ae862e83f1f5d8cb84c0b62f2542dcdec
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
-else
-	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
-+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
-wispr"
-
-REQUIRED_USE="^^ ( iptables nftables )"
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	net-libs/gnutls
-	>=sys-apps/dbus-1.2.24
-	sys-libs/readline:0=
-	nftables? (
-		>=net-libs/libnftnl-1.0.4:0=
-		>=net-libs/libmnl-1.0.0:0=
-	)
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wireguard? ( >=net-libs/libmnl-1.0.0:0= )"
-RDEPEND="${COMMON_DEPEND}
-	bluetooth? ( net-wireless/bluez )
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	l2tp? ( net-dialup/xl2tpd )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
-
-if [ ! -z ${COMMIT} ]; then
-	S=${WORKDIR}/${PN}-${COMMIT}
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-
-	cp "${FILESDIR}"/connman.initd2 "${T}"
-	if use iwd; then
-		sed -i \
-			-e "s/need dbus/need dbus iwd/" \
-			-e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \
-			"${T}"/connman.initd2 || die
-		sed -i \
-			-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \
-			src/connman.service.in || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var \
-		--runstatedir=/run \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable debug) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable examples test) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable networkmanager nmcompat) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable tools) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wireguard) \
-		$(use_enable wispr wispr builtin) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-		)
-	# wifi USE logic to match networkmanager ebuild behavior
-	if use wifi; then
-		if use iwd; then
-			myeconfargs+=( --enable-iwd --disable-wifi )
-		else
-			myeconfargs+=( --disable-iwd --enable-wifi=builtin )
-		fi
-	else
-		myeconfargs+=( --disable-iwd --disable-wifi )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${T}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process connman_resolvconf.conf
-}
diff --git a/net-misc/connman/connman-1.42_pre20230411.ebuild b/net-misc/connman/connman-1.42_pre20230411.ebuild
deleted file mode 100644
index f30ba8c349dd..000000000000
--- a/net-misc/connman/connman-1.42_pre20230411.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-inherit autotools systemd tmpfiles
-
-COMMIT=24180d1243bf005c721be6f9d8d6da67bb669c55
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
-else
-	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
-+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
-wispr"
-
-REQUIRED_USE="^^ ( iptables nftables )"
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	net-libs/gnutls
-	>=sys-apps/dbus-1.2.24
-	sys-libs/readline:0=
-	nftables? (
-		>=net-libs/libnftnl-1.0.4:0=
-		>=net-libs/libmnl-1.0.0:0=
-	)
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wireguard? ( >=net-libs/libmnl-1.0.0:0= )"
-RDEPEND="${COMMON_DEPEND}
-	bluetooth? ( net-wireless/bluez )
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	l2tp? ( net-dialup/xl2tpd )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
-
-if [ ! -z ${COMMIT} ]; then
-	S=${WORKDIR}/${PN}-${COMMIT}
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-
-	cp "${FILESDIR}"/connman.initd2 "${T}"
-	if use iwd; then
-		sed -i \
-			-e "s/need dbus/need dbus iwd/" \
-			-e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \
-			"${T}"/connman.initd2 || die
-		sed -i \
-			-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \
-			src/connman.service.in || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var \
-		--runstatedir=/run \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable debug) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable examples test) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable networkmanager nmcompat) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable tools) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wireguard) \
-		$(use_enable wispr wispr builtin) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-		)
-	# wifi USE logic to match networkmanager ebuild behavior
-	if use wifi; then
-		if use iwd; then
-			myeconfargs+=( --enable-iwd --disable-wifi )
-		else
-			myeconfargs+=( --disable-iwd --enable-wifi=builtin )
-		fi
-	else
-		myeconfargs+=( --disable-iwd --disable-wifi )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${T}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process connman_resolvconf.conf
-}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 69772fca8aab..217d7d68ac6a 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,9 +1,11 @@
 AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 DIST nextcloud-client-3.10.0.tar.gz 13529232 BLAKE2B 3c3f2e823df35d365ae73afa4d59e9afd44bac5873de336b340712c03a18b38bf33f1af8b9dec52f8628034feeb720a3e48e6d435f64f170a57c17f2bfca7d56 SHA512 f4cfa4884e445cf30b4b47077ba4db31f70f1388e235d994886e6aa9e4b0a80426159336d476d057abf422d4201ea608cf54f4e9b04189198f48214315a67330
+DIST nextcloud-client-3.10.1.tar.gz 13519993 BLAKE2B a23afcfe35c3f7a8a01656cf67ea681a7eac40989939b5bf1991eb7334993fddab6c501636292b8526c02b872af8cfed97568e2d263a3dbf3f78985caac3a1ce SHA512 866fcae59a6afc39bd874892f1ca6fc2afcfa2e0166d431829462afbf8d6f7b25a46700737515fe98c3a002c3a34bd9de42cbecdf80134661544c1e590708b43
 DIST nextcloud-client-3.8.2.tar.gz 15605319 BLAKE2B babd45d0a38d5206afd9c2b69e7ea580aeb90df2606932cbfc28f688b20bb026e566ca8a30112975ae38c8d9807339433c8b972230c6a8122cb93ffadd2eecab SHA512 231e074fd3dcc8f69d62616ff4aeec5e748891bf93fc783861008a4e04a12066e77e1449d94f599e5edfa9861bad684403aef80e909e095c16170d8607626a9d
 DIST nextcloud-client-3.9.1.tar.gz 15733029 BLAKE2B e7e792b2ea7985c02627661b4686bf568dfe8cfe722babbf5507293daec57b754566d259d3fd4bc0b224e1dc34ae0afa4c757e75910c4d6d4ded692f0d7c2b02 SHA512 b3c77243efed3b70a59c157ae6f45ebf8eb8c4926e23bd78b364e93cbc2612ec220db60ef6bd55e288a2eb5a454fea87fd348116057b052a15b5c6c69f0654d2
 DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4
 EBUILD nextcloud-client-3.10.0.ebuild 2719 BLAKE2B 08d1ee57eea57daf8c2786911d189b9840b5cd732e744b6840bebc157167f0c5d89af5c24aedf7995863580c7b0aa0a00730d2b598c9983d0d1e41a8cdec508d SHA512 595258969684088b6b304bfdadbe80a3aa6b5a9dfed7d1062c1fb5f0f1b6deb59050cdedf11c62697c91fdcf3cf72ef1a19127fa2d01862fd9bdb6a868e3a8ce
+EBUILD nextcloud-client-3.10.1.ebuild 2719 BLAKE2B 08d1ee57eea57daf8c2786911d189b9840b5cd732e744b6840bebc157167f0c5d89af5c24aedf7995863580c7b0aa0a00730d2b598c9983d0d1e41a8cdec508d SHA512 595258969684088b6b304bfdadbe80a3aa6b5a9dfed7d1062c1fb5f0f1b6deb59050cdedf11c62697c91fdcf3cf72ef1a19127fa2d01862fd9bdb6a868e3a8ce
 EBUILD nextcloud-client-3.8.2-r1.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
 EBUILD nextcloud-client-3.9.1.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
 EBUILD nextcloud-client-3.9.4.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.10.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.10.1.ebuild
new file mode 100644
index 000000000000..94cff32e49fb
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.10.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 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 ~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/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() {
+	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/remmina/Manifest b/net-misc/remmina/Manifest
index ed99b38747ee..3664b24a2c9b 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,12 +1,6 @@
 AUX remmina-1.4.32-REM-2981.patch 2104 BLAKE2B e9cf4692a218e0abfbc1ef0b4e694d239ac70dcdf177e83c7250638d27171cf378055e0889836f1c94c9fcd3d536eaf1270844eebc67ba63d9b3ecdbf69fb485 SHA512 0e6fd380017054bad76176fce973cefc8607c6a80cfb5dd3a755972bb1bcfd8da6cb7919896307b6d53a8a5fa123606825615dc840ad7f264c29d160734f0b17
-DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
-DIST Remmina-v1.4.30.tar.bz2 2026559 BLAKE2B 96b4946e5d9480239f5089369cca6fee7bbe9129bb87f685d849df745cef7eca5b20cd8053ec3250378c1ca2be34e1b3c40d463a45c655aca65a73e9ac018593 SHA512 4e2beb4fd27bd9060a95735bd43ee80260d036bb59c406aa0d9ef63fcbd04c6e358384416b2308367d88a1f87d6e1af42299a21d59fd06dce785b9cfe1b67c84
 DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35 SHA512 288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838
-DIST Remmina-v1.4.32.tar.bz2 2096310 BLAKE2B 2b625e8dc79c4942093c141acc6c256dce4067176422552abafdecc3d933d3196a50023632de56b1036e0f4d740a9601e1367431899da63a8fb463d5ab58f6d4 SHA512 ad5289b63038846d96ca193c37b266b19e15dbd0f513ce8cea936a81cdbb6b7476c465657944938c34695cb3ff16ade81b4a7ed37c3ab08257537b121c2ad7e9
 DIST Remmina-v1.4.33.tar.bz2 2105164 BLAKE2B 94f73f895f7e0478779d71097ee57ba049299e702527df2cf8a48ea41647f641684131b10b2f4faa7cf831ccea29611a68c2427127a2ebea87acac54f996a446 SHA512 c019131d2c3756946a332a3037286c8370a2e07b20a416c657cc2852ece9e59236499a2c5e45d4e9f391d9265089763957c6968c668e110c350e668053db6d82
-EBUILD remmina-1.4.29-r2.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
-EBUILD remmina-1.4.30.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
 EBUILD remmina-1.4.31.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
-EBUILD remmina-1.4.32.ebuild 2705 BLAKE2B 85cda871f916a66176b3331b412685767682df20fcc423c1755b7c643f10595d51a53b5b1e062436263840d07abbd49b6290b3647441580ee622d2362a6dfdc7 SHA512 429d6d299cc7c84aef46cbc8be3bc2251ffb8bc4f19e1891ea4d9de62315977f80dc2cb9490b2e8c3e68582a85d83d869e374561d89ac1078c37f52d090c2401
 EBUILD remmina-1.4.33.ebuild 2762 BLAKE2B a999fc2fefab690a0137f1053d99145beddd5b596f8bc8a49ab24cf9d795a24cf32d032241b03555f4d3a0e7ae5d0ff9c7986d8dfc4cbbb06e217cda750e534b SHA512 c3694063a07300d906d4b5ba3e4b7b6fe23df53078dda4af1cd751b9eeac4d9e419c7443c11826f5a6dd1c4902236556ec144936e2934d5cc1bafd02d3c2a633
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.29-r2.ebuild b/net-misc/remmina/remmina-1.4.29-r2.ebuild
deleted file mode 100644
index b362cbf26010..000000000000
--- a/net-misc/remmina/remmina-1.4.29-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libayatana-appindicator )
-	crypt? ( dev-libs/libgcrypt:0= )
-	keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4.1 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.30.ebuild b/net-misc/remmina/remmina-1.4.30.ebuild
deleted file mode 100644
index b362cbf26010..000000000000
--- a/net-misc/remmina/remmina-1.4.30.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libayatana-appindicator )
-	crypt? ( dev-libs/libgcrypt:0= )
-	keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4.1 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.32.ebuild b/net-misc/remmina/remmina-1.4.32.ebuild
deleted file mode 100644
index f3cd0f535fb5..000000000000
--- a/net-misc/remmina/remmina-1.4.32.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libayatana-appindicator )
-	crypt? ( dev-libs/libgcrypt:0= )
-	keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4.1 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	PATCHES+=( "${FILESDIR}"/${P}-REM-2981.patch ) #914851
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}