gentoo auto-resync : 02:11:2024 - 03:04:23

author: V3n3RiX <venerix@koprulu.sector> 2024-11-02 03:04:24 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-11-02 03:04:24 +0000
commit: 37a097af13d675b83911ac006ee9ee22d2163f9a (patch)
tree: 75294129093c3332ea0ba918643a3485b19550f6 /net-misc
parent: aac5e1b02ac846f5e1ce85f4f66fdec46aa9b0d1 (diff)
27 files changed, 66 insertions, 1291 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9cf6239dbc3a..974f1cbbd278 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index f94bea8d0046..7e3313d1bd6d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -17,7 +17,7 @@ DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692
 DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359
 DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
 DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
-EBUILD curl-8.10.1.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6
+EBUILD curl-8.10.1.ebuild 11385 BLAKE2B 8699a137771cfde1a86d24763967c6c0f91e5cf12b288f456ff62eab08f17c017c54bd44b823058a25dab60e01bbb53c2da84b998d7e71a7be1214194f2c8d68 SHA512 11028df4e1c4c875a7b83b895c720e4982bd9111cdbed1b073b31655aff607743a440b9ca7b4d7c33206955480f1949e33f545e546c835bfc6fd53dd7a9fb8eb
 EBUILD curl-8.7.1-r4.ebuild 11261 BLAKE2B 0d1acdce1b58e97d83ee0e67ac0e145894a1bd19e23635649bec06bcd6a45e6487954b497992a7039243ca6860393d2b5115caf2d9edab1a3fbefc46451e2c6f SHA512 687aa43ec10a118f2d53d8532423bf3ffc6eb1ee60f509c3677cc4afcfe1f871b87e18fa5bd045fa86570ae4285432da59adb5f0b548e7da6ed46c9d8a9ad3e5
 EBUILD curl-8.8.0-r1.ebuild 11487 BLAKE2B e97f24d529bd6d41556d0584f3bc296754d9ec04b9080bd8ca1dfdce1e12ddf7c50683f2a9c6249b85392f9fd988a3707c04e2ef2bf4a7956390a394cbca6831 SHA512 8c8b3b2ffc3a4c2bb8d83f0da258e3bb664a365c9fc29af387b33df079658c0ec6cd148a93fc36c34c990bf98637125db1826415d3c34887e60f9a6458e2bba4
 EBUILD curl-8.9.1-r1.ebuild 11435 BLAKE2B c54e700dbd603d459b7ec54da874c0fa9f27ad6192caa4057d83858599e1b9c0f8744268e689fc98942aff850b65d6638fa2081c43be19fb6018cc31c4c54f8c SHA512 bf5211f859acfc46b7903df7ca0edc2b88c10efb1343f55d2c21ef30c5e2f1844657babb9efb81ea28960c2b69174992c903181d9cf6d213f0ea72db14343b24
diff --git a/net-misc/curl/curl-8.10.1.ebuild b/net-misc/curl/curl-8.10.1.ebuild
index 8aa5f19b3d9c..d11410c2a4c6 100644
--- a/net-misc/curl/curl-8.10.1.ebuild
+++ b/net-misc/curl/curl-8.10.1.ebuild
@@ -21,7 +21,7 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index a0edb5562fda..8b79da70a6f4 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,7 +3,6 @@ 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
 AUX freerdp-3.6.3-backports.patch 9269 BLAKE2B 24f9c976c5406b967a207179a2fb86f1f1ffec73ff46d7f049f628817aac7ccf1a71e6f76c5fbd5e569a599e01880ee5d27ad3f328a27c836972984ce6d53e4a SHA512 febce83fe7006b4e3112dcd385d3c2911290f7aa9cdc702bbd2d2163ef153a86dd2ba57afac75c491505bbc947e02db74c185d86abad832a38c6f091c2602c80
-DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 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
@@ -13,12 +12,14 @@ DIST freerdp-3.7.0.tar.gz 10223833 BLAKE2B 6d1fab8a88dd9113c6daf0d609cac006d1303
 DIST freerdp-3.7.0.tar.gz.asc 228 BLAKE2B 87cd5f8cb8286eaf108098ee8baa7ed7c6e05b0d3e78050d16f96f6327c40f03bbe96b6aac719a8203240b4eb02e175daad57189dc7e0a0e022b02372aa69d6f SHA512 b62cf129db113ae727669f26de8dc971e33b78cf0b83e5f84a518c30366ff74c14675701870e9e09aedaad23000b3316a04a76cb7df475f3e4d5465f206b0e30
 DIST freerdp-3.8.0.tar.gz 10235403 BLAKE2B 96a788e6f394d21cc57c8dc729d1fe5f80b7dbd0119342358a59b63dda7e9e687f17aa0b6c812c33f4a3f3dd34c067e1206418083d2b61b3e5d20b75e6846093 SHA512 ebe724930ea56890a83514496bd11fcc6f77f170a3bb3de4b62506fa2e8bc919cf8593d7e93a9a421fdea22976ddc3f3dbd921fd9e0fb3c7dbd288e387a1c238
 DIST freerdp-3.8.0.tar.gz.asc 228 BLAKE2B 442b48027cbb7fe8cee9a2599772d317f003635939c3f8201097fefd0e2d2f5ec8776a18db23cac47f153c02864b976893f2fccb9050c638f0b94d7b98b5bd40 SHA512 d6be8aa062544b6cb05b39b4036da5403786d02db1ccf11363bfb9ef71c64703051305dfd3de46ac8ec986a664c849521f22d3061112c851a7e40038b827a3e6
-EBUILD freerdp-2.11.5-r10.ebuild 3675 BLAKE2B 81ed6fb24d6bdd2ca894b2368e47adc29996441fa251ab5e4fa5d45128027a446c83f733dc9c010c6701e4b42bec15d987381bc3d72a234563c021552fd18a7e SHA512 910dad20fca8dbd8a287b31769f71fb2f660f4001df1b013e1340e19898fe2fd950765517faea66ecb9b8488b7bd1e87595813dccde3749a76f91b92b6a5b4e8
+DIST freerdp-3.9.0.tar.gz 10308500 BLAKE2B f86ffd6e77cc19985b30b93d76cbb02a0884c445bf7b6f18112b0a39f66563e843ed2d981c6c76b8c4d8af4528d8e3c4d58aec37fb73e251ee5f076b8f041848 SHA512 2b2e181e3b49f9769091c5188060b6a2f0e3a68620795673ce1d577149705c637312b5747846481027e8a2ee4f56cbdec71becc2cb9db6d36906284d8029d125
+DIST freerdp-3.9.0.tar.gz.asc 228 BLAKE2B 6749a3c9cd7fff6b46ebe36d253f64be8abcd46ba153d73fb64fb0128fee4be3beca4b61983e29ac842ee04c262d3c353ed890e279c07609439d3fcd740b9b29 SHA512 ef3eda5d31db6622d2fc12b3c1b242059d9570a10135113eba908584495b64ead33d6406c69f85c3e2c7583134a2cdf409abf93c6c502e454056c17729cc9d05
 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-r12.ebuild 4202 BLAKE2B 5f55807ba41422d61497b7ee08a0b150ad41a92ea50a83c9d1aaac06700b1b7b99927c651a9e861860935bb0643174be983e09e2b9f07e5cf99bb3c75016d2b1 SHA512 6a3029a833773ae2e30da1510d4a7d0b185cc300d1c53c164ae8da5f63b3fd63d2a0bc90616546b0ce45f162eda34b907230392267facb948123ea3ef60d21a2
 EBUILD freerdp-3.6.3.ebuild 4340 BLAKE2B 8472e441c21a0a9495242e314e52be5013b17b54a8694d6fe8560cb8e31fbbd23996fdabb98de6d87c0f4c1b5eb4596d416d41d3039904d747fa3ff12f7ca425 SHA512 4bf09d96f4931f12d1511a75599bdcb8cb28b80b4d43ebd8d16e33e8210ffbdf1690fac6d66c06657d165d22db1ac5db1eff4cae0eacc466ffb4f8d7ba764d23
 EBUILD freerdp-3.7.0.ebuild 4288 BLAKE2B 46b1483dc049b9a791bc35d29a8c411a5d9a3c9efb0768ccfa51b9f95fb050815611fc25339f55797ca605a0bf0f9cdea27bac61ee532c6e88932068b8a8c237 SHA512 284f977053213df5d2ca5f7e1e778a513a38e0c37e853133ec3f7a1520940f742ab9112d8383190cb2fd17d5f3cc7a08b88cd9efb199746db069a8a54c7eb517
 EBUILD freerdp-3.8.0.ebuild 4566 BLAKE2B 361aa3061b8f579ded57069aa9589f01645a3a2f288e24f605abb594d5026608ab55c132cd2b1a55fc4b619e3810cc2f6f6ff5cc4cf4258faca716195d559448 SHA512 80b846fb437a526adb5fe15e24296585ff1bf8c6efb659b7ea580a1ba38ff829d6f3c221171fd1f482a3a8a5726b3c85be679bec17a92c9daf613df285dedd3c
+EBUILD freerdp-3.9.0.ebuild 4566 BLAKE2B 361aa3061b8f579ded57069aa9589f01645a3a2f288e24f605abb594d5026608ab55c132cd2b1a55fc4b619e3810cc2f6f6ff5cc4cf4258faca716195d559448 SHA512 80b846fb437a526adb5fe15e24296585ff1bf8c6efb659b7ea580a1ba38ff829d6f3c221171fd1f482a3a8a5726b3c85be679bec17a92c9daf613df285dedd3c
 EBUILD freerdp-9999.ebuild 4566 BLAKE2B 361aa3061b8f579ded57069aa9589f01645a3a2f288e24f605abb594d5026608ab55c132cd2b1a55fc4b619e3810cc2f6f6ff5cc4cf4258faca716195d559448 SHA512 80b846fb437a526adb5fe15e24296585ff1bf8c6efb659b7ea580a1ba38ff829d6f3c221171fd1f482a3a8a5726b3c85be679bec17a92c9daf613df285dedd3c
 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae
diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-3.9.0.ebuild
index 6c9b29344718..5907f28cdfca 100644
--- a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild
+++ b/net-misc/freerdp/freerdp-3.9.0.ebuild
@@ -12,29 +12,33 @@ if [[ ${PV} == *9999 ]]; then
 		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"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
+	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"
+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="
+BDEPEND+="
 	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
+	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? (
@@ -55,16 +59,21 @@ COMMON_DEPEND="
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
+	fuse? ( sys-fs/fuse:3 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
+		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
@@ -94,18 +103,11 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!net-misc/freerdp:0
-	client? ( !net-misc/freerdp:3[client] )
-	server? ( !net-misc/freerdp:3[server] )
+	client? ( !net-misc/freerdp:2[client] )
+	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( app-crypt/p11-kit )
 "
 
-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
 }
@@ -118,51 +120,80 @@ option_client() {
 	fi
 }
 
+run_for_testing() {
+	if use test; then
+		local BUILD_DIR="${WORKDIR}/${P}_testing"
+		"$@"
+	fi
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
+	freerdp_configure -DBUILD_TESTING=OFF
+	run_for_testing freerdp_configure -DBUILD_TESTING=ON
+}
 
+freerdp_configure() {
 	local mycmakeargs=(
 		-Wno-dev
-		-DBUILD_TESTING=$(option test)
+
+		# https://bugs.gentoo.org/927037
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
 		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_AAD=$(option aad)
 		-DWITH_ALSA=$(option alsa)
 		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(option cups)
 		-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_ICU=$(option icu)
 		-DWITH_JPEG=$(option jpeg)
-		-DWITH_GSSAPI=$(option kerberos)
+		-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_PCSC=$(option smartcard)
 		-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_compile() {
+	cmake_src_compile
+	run_for_testing cmake_src_compile
+}
+
 src_test() {
 	local myctestargs=( -E TestBacktrace )
-	cmake_src_test
+	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
+	run_for_testing cmake_src_test
 }
 
 src_install() {
 	cmake_src_install
-	mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die
+	mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
 }
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 0b819e874d4a..ef944dd07003 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -5,10 +5,8 @@ AUX frr-openrc-v2 7079 BLAKE2B abbad56f0715b79ba5ba24df373ccb8ab63caa12b04d89269
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-10.0.2.tar.gz 10968487 BLAKE2B 420503f25e2e40ce9f53cbb04416ba6d2fd8c7c0958f2d42391d7b534e0547e9ee429ad419cb87a06331efa75603bac1a8439844fe6a478f3b5513e656cab726 SHA512 d37373faab6b004b2bb3d99bee76a4a620ef9dcacfeadb9bbea611cb01ece869467583cde656715d50912b44a84da27103da9b2e76da8bcec9c95436ac45393c
 DIST frr-10.1.1.tar.gz 11044980 BLAKE2B 32e50394c35712bc4799cae23c369aca6307d92b20a52ca9c2264b9ee82798d4372816cf87fc6e5c00c14d7aa85b08d3560f7ef6e0d72dd2a2ad231f8f7e3841 SHA512 c555bafc7437e8ba0216bd9cc7e0a432af4c9877255ab4ffdd97a0b7626eb3c9022051b91f6cd5d27d06531f6edef84742b67169ebbc040b8a904e58712cb654
-DIST frr-9.0.4.tar.gz 10346069 BLAKE2B 63c7cec0fdaccba058bac757b68906c2cf0ec307f5313a299ef943f1c708dfa0ec0dee8bd8f743f9e54a3ed06f484435bb032294c4e2d0a026a2bd4187e14ec2 SHA512 e3717945176f72e14722e929a99f1a62ddd5332988d671950253ea4efc2e83f0464043e7acf990df6bc9306b81f4a32633a0debf92c8a19d13edd38a9bb4eaea
 DIST frr-9.1.2.tar.gz 10790677 BLAKE2B dfa4967ee0e0bbecea016b9deeb70b1c1b9e409469de145050602608dddd41857be946e8df5c8a594dfaf6a124729af55d7ce4483e6fe6edc41125f09d9dabd2 SHA512 e0ed613090140ece181bff077a7067a00a5fca648ec6627c02d815060087497c68712c1ba244fa1534cdbcef49db92bd9432545d05027dc4b04db4f423726882
 EBUILD frr-10.0.2.ebuild 3590 BLAKE2B 28cbff36c8d3f1dae34807c82d69a2f7a19f16bef5dc2a6c0793886189573ae18b0bee7e4c0456c6129c9390d11a57e43d933463d5f8350bfe16948742811401 SHA512 67d15ab63a9faf5734dc309b5f180395ce353fd4ac67725d23efb772c32a2ff34f5425ea18817f6627d469910bd61cca7122f4de36935a25465635812a8b2bcc
 EBUILD frr-10.1.1.ebuild 3590 BLAKE2B 28cbff36c8d3f1dae34807c82d69a2f7a19f16bef5dc2a6c0793886189573ae18b0bee7e4c0456c6129c9390d11a57e43d933463d5f8350bfe16948742811401 SHA512 67d15ab63a9faf5734dc309b5f180395ce353fd4ac67725d23efb772c32a2ff34f5425ea18817f6627d469910bd61cca7122f4de36935a25465635812a8b2bcc
-EBUILD frr-9.0.4.ebuild 3592 BLAKE2B 570fbd267aa9656d787a5ae3faff435ee95465b31b1e874cb0f42d607821e1b8620fc8db4a7b42a3ada48fac5534c625950cb24773247bb0bfa65ebc79453816 SHA512 e89c4787fcb05714eacd75c4a8f9787006874047bf101c9c3b1724fc322cbfdb7048e44336b059901e6a9ccefbd3d53da1df81537604d4ecec5bb46c07ad42eb
 EBUILD frr-9.1.2.ebuild 3403 BLAKE2B 5534c9fa814ca3c614fbd2c77b9894c5b0228d7d50aecb5c755fdca5ad8a7eda10edbc3515d14574345f1af92290ca5bbe97c8f167bd072e8ce3f1b807f0b416 SHA512 684f516c8e0086ebc5753d6d06bfc2f302dd2e3093319dbda31d78626b6ec1f984b7064be43ca36c2658723367e460e523ba98429d058a59ff482d4bf0dd6556
 MISC metadata.xml 1001 BLAKE2B 32254a7ceb76fb6869dc4b140b54968001eaee2347cde49597a6a599f98b5efcb3e0102e3c7cbd9969a1bc137228be07efb56f791b490ddbaaa8e5c2cf13fba4 SHA512 e63bee06b1eb237fb9e5872a16c294d3378b1a48da1d950e6cc7d6734128c81d019d66fc8be02b9935c9a4e19552f20db335a3296070bcebf4621ffcb3efe91b
diff --git a/net-misc/frr/frr-9.0.4.ebuild b/net-misc/frr/frr-9.0.4.ebuild
deleted file mode 100644
index 92169ce4fded..000000000000
--- a/net-misc/frr/frr-9.0.4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	dev-libs/protobuf-c:0=
-	>=net-libs/libyang-2.0.0
-	<net-libs/libyang-2.1.111
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	~dev-util/clippy-${PV}
-	sys-devel/flex
-	app-alternatives/yacc
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-		dev-util/cunit
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	mallinfo # No functional impact.
-	mallinfo2
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		LEX=flex
-		--disable-static
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--with-clippy="${BROOT}"/usr/bin/clippy
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	keepdir /etc/frr
-	fowners frr:frr /etc/frr
-	fperms 775 /etc/frr
-
-	# Create logs directory with the correct permissions
-	keepdir /var/log/frr
-	fowners frr:frr /var/log/frr
-	fperms 775 /var/log/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins tools/etc/frr/vtysh.conf
-	doins tools/etc/frr/frr.conf
-	doins tools/etc/frr/daemons
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/vtysh.conf
-	fowners frr:frr /etc/frr/frr.conf
-	fowners frr:frr /etc/frr/daemons
-	fperms 640 /etc/frr/vtysh.conf
-	fperms 640 /etc/frr/frr.conf
-	fperms 640 /etc/frr/daemons
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v2 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 07c787586837..eed1a8d764dd 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,12 +1,10 @@
 AUX kafka-connect-distributed.init.d 836 BLAKE2B 983a7eff314d7d09e3d6c01de7187b4b2537afef26143e5f8ec518553dd234940e1397f6217d965e6921b43947f956040cd11a19a9690f966f26f4dcbbd435e2 SHA512 4f999fc28d4f3b7df92d74391041efb17f64b2c4f111a8b2a40a39e50b647f90bc3d363b2b957f8da1fc4ca7fe96c1699f3b09cc0d8ced3b693b091f07dd7697
 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010
 AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d
-DIST kafka_2.13-3.5.2.tgz 110420856 BLAKE2B fd59e7fcb22a944f6fdee4ecda7d418f3818c42b23a0b8a02ef629781ed8a34c95e4ad75560f9e3fb9bbc32933f7960f086c39d2294c336b8ab520c887aa8a22 SHA512 229ccc5e3e6b3b9845f59f6e829d70711c5a5a2293f32b6bcabc37350666f874bc7d8f08130f712a1b32915205c10f2847f04908c20d5f7fdb4b62d058c9defe
-DIST kafka_2.13-3.6.1.tgz 113466638 BLAKE2B 1142459c2810cf4df8785afc9fab57440357000a97b23cfec8b6c59d886706d4fd13120388e9473917106c1cb237f65671bb1258de1343ef7818b3b97617f0b4 SHA512 1f063cd67463dd3bb5a5e06e7a1c2278db84bfc836a634fac7c9a005de66a42ac00b32f5e9bbdd22086605f73659efd4ce5bd1185196b02a743be0898daac55d
 DIST kafka_2.13-3.7.1.tgz 120235344 BLAKE2B ae78e77b52eae9099f700a7644120b307cb2e8f84fb76b313b4fe208988d7010856a36253eb3ce4196a3bb8ac1c791e9d83969913f67553dea702f4b55675446 SHA512 78e985235d245ba9e2951a82e723a62b8aba8b74a2c8376f7271906af715a36de9142c446096f13fd4bff3a4c10f1d080eb924e91e2256ec2db779906fd6737d
 DIST kafka_2.13-3.8.0.tgz 120735482 BLAKE2B 3ea97f26b650b7f2f3741d40b95e9e247fc8bade4bc4a767b7cd61338618d23dbca016da24bbb6dd07ddfee1ac239b89de441e46720fe490d2e6693e4f5b810e SHA512 0a33b7be7b6fa53249ba80f9d02cda71ed81927c160aa6ee9be1e3d3c1c4b50466ffc905293143fd88ceac7f5e7d8f5bec28ef972addd3c459cc8b1291e738aa
-EBUILD kafka-bin-3.5.2.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
-EBUILD kafka-bin-3.6.1.ebuild 2065 BLAKE2B 8405b16c621951140f30bde027b26337dfc11bdc8b1800b65c5fc7c3e1ac52075a7479a6303df60ed27d42af6e266825de090dcd66bfe9156d3af78ce55b4da9 SHA512 70ff29218e9409d07a33275b287ce86d42835e79a1bdf3ab86791ffc764c749f473bf0d86fecffbdfdcf011facad187a4ea47158ef49354fe0ff716cc8f0bb36
+DIST kafka_2.13-3.8.1.tgz 121178579 BLAKE2B 1cca84ca3831c8a7271e61b325a300f9dcc75d38e86d1e10e17d39af045e80752e1bb6a4ee400db9cc94238c5efeaefaea4280da18e0a2fa31c2e1848905ab94 SHA512 b43fada353b7dca51c0f90acf594ec1ce06b2344c046d4059d4deab0615e0e3e76e92eccdbdfa1adad1fbde76c5f25e71acd0db013fb4b1778827448b5285edf
 EBUILD kafka-bin-3.7.1.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
 EBUILD kafka-bin-3.8.0.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
+EBUILD kafka-bin-3.8.1.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
 MISC metadata.xml 390 BLAKE2B b381ee7c8449c21b4036052e12f2442e1480e9790df1e42ac5375dbb13c7c9344e8d2b2f9b80bc75fdafdd023d6a80c2149151233ee7d2908539ef9d998e7445 SHA512 fe9f241db7f81e850901a8d3b7c2d90f043d3b80851132359055e855c9b1c949566aab4a3889b5af56db99e9f18000e40b4f9096221a9bf813ac5e82bb88bf7e
diff --git a/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild
deleted file mode 100644
index 62f5d3c5f537..000000000000
--- a/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="https://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.13
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper connect"
-
-COMMON_DEPEND="acct-group/kafka
-	acct-user/kafka
-	virtual/jre:="
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-	sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die
-	eapply_user
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-
-		ewarn "Zookeeper owner has been changed to kafka:kafka"
-		ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper"
-		ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper"
-		ewarn "to keep the previous behavior."
-		ewarn "All logs files have been move to /var/log/kafka/"
-	fi
-
-	if use "connect"; then
-		doins config/connect-distributed.properties config/connect-standalone.properties
-		newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild b/net-misc/kafka-bin/kafka-bin-3.8.1.ebuild
index 750555119b44..750555119b44 100644
--- a/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-3.8.1.ebuild
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 7b005da1c13e..decc8ba60aae 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,11 +2,9 @@ AUX nextcloud-client-3.13.2-fix_build_kf6.patch 1249 BLAKE2B d7dc92c12e2c952519c
 AUX nextcloud-client-3.14.2-doc-fix.patch 1253 BLAKE2B 8e0c44c5fdb02fc6d815c70a3fb8a9b28fe7d68e2d8b3a5a297a26c194a8866c39222df740cb1ecd70d7f615f491dea5f229b5bf9bf5ec3f7995d2f20254e518 SHA512 b9efc5723eb2f52ba7fc90325696fada2ddc88b47d47df576cfc74750a97b55bad77acda274983530f43c503ded8e4d7cc444005dd62b699926f46fdb2bd87aa
 AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 DIST nextcloud-client-3.12.6.tar.gz 13647404 BLAKE2B 8414c0248596f5bde78074de72a4cc5331741b19c94d2bb40893afbe7821e1016809245c74ddb14daaf21f8c25c80db4e0e752282435734b36d5ea711c2bc81d SHA512 1ac3351f1371eebae46cdeb2aa6b2203dc0c3583abc8b690a6a1764ffd489dcd5b2b56d6f94fa45c212cbd17969f889a36ce3f186e2f99d159728daefb07ff32
-DIST nextcloud-client-3.13.2.tar.gz 13782506 BLAKE2B 867ae6ac056bc818d544d22b3a08c8876c093ca75746217822e3111c9de1e8a6b90ba9e0954e0b8c952082ea39f6f732c8914e267b4b1f1d8af3d8ebf6dbd73e SHA512 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6
 DIST nextcloud-client-3.14.3.tar.gz 13959636 BLAKE2B 1186b04a5aaaa4cacce56966154d08d44867b6b191d50f7159b52509ba3306bbaf98869ed06a636ac8f1c840aaecea62aea72f19fe166f64000ff27cc906b681 SHA512 5ed7c550784175623220eb90fc0b5a4c99a1ead454d33ac15173358616154bcbc6e4740225f5490b3ddf8eae19d337f11ed522552a0378878803e1dfb3aa8cef
 DIST nextcloud-client-3.14.4.tar.gz 13813595 BLAKE2B 310bbf9b8024bb8688bffe65d6993d63d95260f26565998bd1cd734a49bdd5a6d4fc152ee51968d5e705c6440c24c7571f1079ba13fc5d8492cdd57ad57ebe0d SHA512 8de91b288507d13e7dd2c64112f0540f4664ad2a0b02525d5ff5b187dc7eb9af61a40d9f65320284241bb620cf2dcc648ecfe6090d3d09c0dbb865504026b11e
 EBUILD nextcloud-client-3.12.6.ebuild 2748 BLAKE2B 745d2030ba320a4d2b1f82b04b1c614062e823104f4ef5fa938a120842d221a03735cc8c9ff4c2623ec90a1cc4d837d5bdd1a8e0ca5e65e88a718cf83c96b582 SHA512 c6543b531bc8453362f94206b20b21f7e3a1309034d6e3b3134c3b16beba1c283f6a88d120509bea4dc45498658abcdfaec153858d46be0cd9f3ea613a40dfeb
-EBUILD nextcloud-client-3.13.2.ebuild 2821 BLAKE2B 60bee252a4ffa8b855a1888ab82d2d02c65cedd5ec6f65bc734568f64f174019511eb66d8dad98d539bce3738688366f1a9f4455f420a32c903dd10abbf7d890 SHA512 6e36a1d4ed73a0701dfeb8f61d3e1749b745535d937b89617be4c16440d7e6d8b1e25b03a258e3fe6d8f61f29a984290581d4f5bf7098c9102ba7a3c1713ac54
 EBUILD nextcloud-client-3.14.3.ebuild 2857 BLAKE2B 8a1fbd2de685237c66ba2b66effafacbfc67bb3a24509d800c88ee7f7aeadace98cb07bd6798b1f3946d61ee348c2ef5104bd52b1fb46a73f5603e37232c7b1e SHA512 dae05d59c1e41ac57cb9f9a53beb96f027e86242a9083054fa1db5b9b304cf73ed7f4378549115c1eda0b4354122a206c65987a5c35130bd3b49107e86932b80
 EBUILD nextcloud-client-3.14.4.ebuild 2857 BLAKE2B 8a1fbd2de685237c66ba2b66effafacbfc67bb3a24509d800c88ee7f7aeadace98cb07bd6798b1f3946d61ee348c2ef5104bd52b1fb46a73f5603e37232c7b1e SHA512 dae05d59c1e41ac57cb9f9a53beb96f027e86242a9083054fa1db5b9b304cf73ed7f4378549115c1eda0b4354122a206c65987a5c35130bd3b49107e86932b80
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
deleted file mode 100644
index 84a333f1e602..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
+++ /dev/null
@@ -1,117 +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
-	"${FILESDIR}"/${PN}-3.13.2-fix_build_kf6.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/r8125/Manifest b/net-misc/r8125/Manifest
index 819785e1be59..49b7e3a8d2c5 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1,17 +1,4 @@
-AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb6716114bd6cc1b78a5b94f99ea72400f9e9c776eaed60c5dc0593b32857e73aa27883e971b570e7b561cad4b85db1d706194b1 SHA512 a3459c78d55561ae703977e147965b04aa854eff1035c273a703936e6f069d5d501c91cf1db746d0ef93dbfe61c3d28b5d35be34a4982fcbe9f0c42d9204b1bf
-AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
-AUX r8125-9.009.01-linux-5.19.patch 1423 BLAKE2B 3b587a9261aa695cb9fc5e27032d23b15ff557aa1a467985448ce38b5e259d08d5690406b42d1dc068a82a748de0dff53607bf70ac5515d5c9ced0e7803ef4c0 SHA512 803c1f70d9af86f4ba28e72338c3fff2b2976bc9dac5ca2f733f11382afc0a2a4ac018560e70cbae8ecbd3928ea2a79b010630420f4af66475ce5c9bb3ef73a8
-AUX r8125-9.011.00-linux-6.1.patch 1141 BLAKE2B b018c01a34b1fdf6f3cdaebfeff0a2d3dee4ddc0e47cb4f7a2e1953af9a7d7354e161ab9687e5c927135cf945597a7d276fa5ee3f1a9c9f17ed5e294c7e123ab SHA512 0a23b8477cb6d1de10f6b5fedabc0d8de25963f038b425c3e17851cf5eb4bd7cd76c52625c27be71ff5129fc78cc2325cba6ec26acd5bbc9f0995eeec5970587
-AUX r8125-9.011.01-linux-6.2.patch 1523 BLAKE2B bb8d828940f2a94c11c73ff6bcabdc63a4dbd8426fdc6fc53c2416784248a93f8e071af1a25c2df57e5799031061664fcf5a1eea77812f62a222e4dbe9201e07 SHA512 03e7148d2d1363cca8bce1a7a35f28379d059a515e2107db59cf43623b4a7d67ec148bf3363c71c81f68cf667dfe2cbd1637210f06b031bfa21a8c65a2246daa
-DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
-DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
-DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
-DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2
 DIST r8125-9.013.02.tar.bz2 105923 BLAKE2B 0ae1a6a7ad651d30ac2ca29ab98af06c6facc26bfacac8ce5b51e92e8c7955c150a995c424f875a9a1cb315fe41f474ea3429cd7675ceec1ef82d454ad2bd434 SHA512 acb16992182c4c6b79357a511cfcedb53bb6513185caec91a5cb76aa41dc922e6c74099546886b32dba584d614f9bcaf36d31e40f3328b9ebc4ccd6b91296065
-EBUILD r8125-9.008.00-r1.ebuild 1510 BLAKE2B 19d165085a3119a70df54e997300f88bdae903b6a34fbb558143a80ca3984732e37c647e7a3f5d0892ec267807d9fce2d40a8c377144ba59022de1475d50155d SHA512 702b348c97f4a2f41c7f2bb95b8319c13b1717b000344f741869e2ccee2a5470138fbc786329c856dc55a981d384e3f7b2ee78f3351f95cb327c880a664ced7d
-EBUILD r8125-9.009.01-r1.ebuild 1296 BLAKE2B dd4c6e2b6a59186d9ac1341bcf14b125c8b28206b09586e6c10def5399e9adf7912cf97c924c66705acc060622e139bbce0859d3344c44dc674a60aae7c9d0e4 SHA512 86bea15e017ae59010d2f73853710b88804bedab4099858de352e19729d56f055dacf7c7a2ca54120be57632b681c8910871c717aad7f93fdb0ff63cfec1e777
-EBUILD r8125-9.009.02-r1.ebuild 1189 BLAKE2B 491fe1a223eeeaa66c9b844acbf05677715dc269acc2bb9468ccc40d01b5e0ccc8786d8ea377e92985f42d3df28ce5c7964902ef193b7a544b19fdd6c275bd50 SHA512 5fd5df7b14030b4cc137e6f0c71d34c4e4cdaee32bd65c8e3773cc5b188367dbcca58f30bcea8068d180b6daf35d0605f0de5cdb6af5c31060b31c1e5896269c
-EBUILD r8125-9.011.01-r1.ebuild 1250 BLAKE2B 94ace00d1a39c2737f38d37ac4921999f94c2514058e4feca8b3e3fa247d81719e30a8a0586f1c5a329967398ad15f25fe801c94bacb76643be3e5877b647263 SHA512 1323f3bd461938900c768e302d08ac815ca4a492795e0332327a1a2b8ea0603e2940e749daad5762812e18027a8f6fa575f9e868f4d618f1affccaccdf2b1063
 EBUILD r8125-9.013.02-r1.ebuild 1070 BLAKE2B 99ad6268f14300b2e40a692f60aa846718904220effdb2647feda6323d544e457a435057df88ddf3f2f4c62bbf58d3ccbfe70976bf7e50bf138ad2c7cd7cb73a SHA512 51206c39596c604da7447510de594be0642b413b1c80ca6811b364950a7bd12699fd93848f5566d70f64584f5fda7f1e86f362b3a19be7b9ba03c86f9d402e4c
 EBUILD r8125-9.013.02.ebuild 1229 BLAKE2B 8363f518e819fc89036de35cdb83325f11f5fa0db454836bb807d3897c977ecbd593a1abae0ba577d4cb2a0cda5c4bb04690e36b1e2fbaa242cbdb0b940054c6 SHA512 64ed8b67f27a9f214191ea65d3fffe09806dafeac05f2ae4a4efdcc7ba535811d95eba48fdb14ca6cb5ee31b81fe7603a9f5c8aeab9525f43f011609cb9ad049
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch
deleted file mode 100644
index 1a4afdb31bea..000000000000
--- a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Added compatibility with Linux Kernel 5.17+.
-
-Author: Karlson2k (Evgeny Grin)
-Gentoo bug: https://bugs.gentoo.org/839282
-
-diff --git a/src/r8125_n.c b/src/r8125_n.c
---- a/src/r8125_n.c
-+++ b/src/r8125_n.c
-@@ -349,7 +349,7 @@ static int rtl8125_change_mtu(struct net_device *dev, int new_mtu);
- static void rtl8125_down(struct net_device *dev);
- 
- static int rtl8125_set_mac_address(struct net_device *dev, void *p);
--static void rtl8125_rar_set(struct rtl8125_private *tp, uint8_t *addr);
-+static void rtl8125_rar_set(struct rtl8125_private *tp, const uint8_t *addr);
- static void rtl8125_desc_addr_fill(struct rtl8125_private *);
- static void rtl8125_tx_desc_init(struct rtl8125_private *tp);
- static void rtl8125_rx_desc_init(struct rtl8125_private *tp);
-@@ -1750,7 +1750,13 @@ static void rtl8125_proc_module_init(void)
- static int rtl8125_proc_open(struct inode *inode, struct file *file)
- {
-         struct net_device *dev = proc_get_parent_data(inode);
--        int (*show)(struct seq_file *, void *) = PDE_DATA(inode);
-+        int (*show)(struct seq_file *, void *) =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-+            PDE_DATA(inode);
-+#else
-+            pde_data(inode);
-+#endif
-+
- 
-         return single_open(file, show, dev);
- }
-@@ -5234,8 +5240,15 @@ rtl8125_set_ring_size(struct rtl8125_private *tp, u32 rx, u32 tx)
- }
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
- static void rtl8125_get_ringparam(struct net_device *dev,
-                                   struct ethtool_ringparam *ring)
-+#else
-+static void rtl8125_get_ringparam(struct net_device* dev,
-+                                  struct ethtool_ringparam* ring,
-+                                  struct kernel_ethtool_ringparam* kernel_ring,
-+                                  struct netlink_ext_ack* extack)
-+#endif
- {
-         struct rtl8125_private *tp = netdev_priv(dev);
- 
-@@ -5245,8 +5258,15 @@ static void rtl8125_get_ringparam(struct net_device *dev,
-         ring->tx_pending = tp->tx_ring[0].num_tx_desc;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
- static int rtl8125_set_ringparam(struct net_device *dev,
-                                  struct ethtool_ringparam *ring)
-+#else
-+static int rtl8125_set_ringparam(struct net_device* dev,
-+                                 struct ethtool_ringparam* ring,
-+                                 struct kernel_ethtool_ringparam* kernel_ring,
-+                                 struct netlink_ext_ack* extack)
-+#endif
- {
-         struct rtl8125_private *tp = netdev_priv(dev);
-         u32 new_rx_count, new_tx_count;
-@@ -10889,6 +10909,9 @@ rtl8125_get_mac_address(struct net_device *dev)
-         struct rtl8125_private *tp = netdev_priv(dev);
-         int i;
-         u8 mac_addr[MAC_ADDR_LEN];
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+        u8 addr[ETH_ALEN];
-+#endif
- 
-         for (i = 0; i < MAC_ADDR_LEN; i++)
-                 mac_addr[i] = RTL_R8(tp, MAC0 + i);
-@@ -10916,9 +10939,17 @@ rtl8125_get_mac_address(struct net_device *dev)
-         rtl8125_rar_set(tp, mac_addr);
- 
-         for (i = 0; i < MAC_ADDR_LEN; i++) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-                 dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
-                 tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */
-+#else
-+                addr[i] = RTL_R8(tp, MAC0 + i);
-+                tp->org_mac_addr[i] = addr[i]; /* keep the original MAC address */
-+#endif
-         }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+        eth_hw_addr_set(dev, addr);
-+#endif
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- #endif
-@@ -10944,7 +10975,11 @@ rtl8125_set_mac_address(struct net_device *dev,
-         if (!is_valid_ether_addr(addr->sa_data))
-                 return -EADDRNOTAVAIL;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-+#else
-+        eth_hw_addr_set(dev, addr->sa_data);
-+#endif
- 
-         rtl8125_rar_set(tp, dev->dev_addr);
- 
-@@ -10959,7 +10994,7 @@ rtl8125_set_mac_address(struct net_device *dev,
-  *****************************************************************************/
- void
- rtl8125_rar_set(struct rtl8125_private *tp,
--                uint8_t *addr)
-+                const uint8_t *addr)
- {
-         uint32_t rar_low = 0;
-         uint32_t rar_high = 0;
-
-
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
deleted file mode 100644
index 6da1bdae6b6a..000000000000
--- a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Added compatibility with Linux Kernel 5.18+.
-
-Author: Karlson2k (Evgeny Grin)
-Gentoo bug: https://bugs.gentoo.org/852311
-
-diff --git a/src/r8125_n.c b/src/r8125_n.c
-
---- a/src/r8125_n.c
-+++ b/src/r8125_n.c
-@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev,
- 
-         if ((sizeof(dma_addr_t) > 4) &&
-             use_dac &&
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
-             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
-             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
-+#else  // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
-+            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-+            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-+#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
-                 dev->features |= NETIF_F_HIGHDMA;
-         } else {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
-                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-+#else  // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
-+                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-+#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
-                 if (rc < 0) {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-                         if (netif_msg_probe(tp))
-
diff --git a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
deleted file mode 100644
index 8dc3f8749a11..000000000000
--- a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c96e5ffc40585d463bea056f2fe02c29d43dcba7 Mon Sep 17 00:00:00 2001
-From: Evgeny Grin <k2k@narod.ru>
-Date: Mon, 3 Apr 2023 18:17:24 +0300
-Subject: [PATCH] Backport kernel 5.19 compatibility
-
----
- src/r8125_n.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/r8125_n.c b/src/r8125_n.c
-index 0bc5eec..e35e557 100644
---- a/src/r8125_n.c
-+++ b/src/r8125_n.c
-@@ -12715,6 +12715,10 @@ rtl8125_init_one(struct pci_dev *pdev,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-                 dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
-                 dev->features |=  NETIF_F_IPV6_CSUM;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-+                netif_set_tso_max_size(dev, LSO_64K);
-+                netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2);
-+#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-                 netif_set_gso_max_size(dev, LSO_64K);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-                 dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
-@@ -12722,6 +12726,7 @@ rtl8125_init_one(struct pci_dev *pdev,
-                 dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
- #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
- 
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
- #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
--- 
-2.40.0
-
diff --git a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch
deleted file mode 100644
index 343ab8ccf125..000000000000
--- a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cc2a99963b0039573464816f0cf86803381d5f11 Mon Sep 17 00:00:00 2001
-From: Evgeny Grin <k2k@narod.ru>
-Date: Mon, 3 Apr 2023 16:46:39 +0300
-Subject: [PATCH] Fixed compatibility with Linux kernel versions >= 6.1
-
----
- src/r8125.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/r8125.h b/src/r8125.h
-index 9eac0eb..4a29116 100644
---- a/src/r8125.h
-+++ b/src/r8125.h
-@@ -676,7 +676,11 @@ typedef int *napi_budget;
- typedef struct napi_struct *napi_ptr;
- typedef int napi_budget;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
-+#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(ndev, &priv->napi, function, weight)
-+#else  // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
- #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
-+#endif // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
- #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)
- #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)
- #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;
--- 
-2.40.0
-
diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
deleted file mode 100644
index 26bb8620fbfd..000000000000
--- a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001
-From: Evgeny Grin <k2k@narod.ru>
-Date: Tue, 27 Jun 2023 11:16:26 +0300
-Subject: [PATCH] Patched PTP functionality for Linux 6.2+
-
----
- src/r8125_ptp.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c
-index 6010a18..b92fb18 100644
---- a/src/r8125_ptp.c
-+++ b/src/r8125_ptp.c
-@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta)
-         return 0;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
-+static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
-+{
-+        return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm));
-+}
-+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
-+
- static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64)
- {
-         struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info);
-@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = {
-         .n_per_out  = 0,
-         .n_pins     = 0,
-         .pps        = 1,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)
-         .adjfreq    = rtl8125_phc_adjfreq,
-+#else  /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
-+        .adjfine    = rtl8125_phc_adjfine,
-+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
-         .adjtime    = rtl8125_phc_adjtime,
-         .gettime64  = rtl8125_phc_gettime,
-         .settime64  = rtl8125_phc_settime,
--- 
-2.41.0.windows.1
-
diff --git a/net-misc/r8125/r8125-9.008.00-r1.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild
deleted file mode 100644
index 3779fd117278..000000000000
--- a/net-misc/r8125/r8125-9.008.00-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# The alternative direct URL for the file from the link above with description
-# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
-	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
-	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
-	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
-	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
-	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
-	local modargs=(
-		# Build parameters
-		KERNELDIR="${KV_OUT_DIR}"
-		# Configuration settings
-		ENABLE_PTP_SUPPORT=$(usex ptp y n)
-		ENABLE_RSS_SUPPORT=$(usex rss y n)
-		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
-		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
-	)
-
-	linux-mod-r1_src_compile
-}
diff --git a/net-misc/r8125/r8125-9.009.01-r1.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild
deleted file mode 100644
index 87bff3e7fb42..000000000000
--- a/net-misc/r8125/r8125-9.009.01-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
-	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
-	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
-	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
-	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
-	local modargs=(
-		# Build parameters
-		KERNELDIR="${KV_OUT_DIR}"
-		# Configuration settings
-		ENABLE_PTP_SUPPORT=$(usex ptp y n)
-		ENABLE_RSS_SUPPORT=$(usex rss y n)
-		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
-		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
-	)
-
-	linux-mod-r1_src_compile
-}
diff --git a/net-misc/r8125/r8125-9.009.02-r1.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild
deleted file mode 100644
index 61bad3803fde..000000000000
--- a/net-misc/r8125/r8125-9.009.02-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
-	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
-	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
-	local modargs=(
-		# Build parameters
-		KERNELDIR="${KV_OUT_DIR}"
-		# Configuration settings
-		ENABLE_PTP_SUPPORT=$(usex ptp y n)
-		ENABLE_RSS_SUPPORT=$(usex rss y n)
-		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
-		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
-	)
-
-	linux-mod-r1_src_compile
-}
diff --git a/net-misc/r8125/r8125-9.011.01-r1.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild
deleted file mode 100644
index e206e4deaa7c..000000000000
--- a/net-misc/r8125/r8125-9.011.01-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
-	"${FILESDIR}/${P}-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
-	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
-	local modargs=(
-		# Build parameters
-		KERNELDIR="${KV_OUT_DIR}"
-		# Configuration settings
-		ENABLE_PTP_SUPPORT=$(usex ptp y n)
-		ENABLE_RSS_SUPPORT=$(usex rss y n)
-		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
-		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
-		ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP
-		ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP
-	)
-
-	linux-mod-r1_src_compile
-}
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 025153ceda2f..bb89f447443c 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -10,5 +10,5 @@ AUX sitecopy-0.16.6-33-c99-build-fix.patch 304 BLAKE2B 6bafbaec861af759dcc3de59e
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
 EBUILD sitecopy-0.16.6-r2.ebuild 2031 BLAKE2B 2a0a279bfe2359f42ef82f728d3ed6331f1a1d0198148e183326e12a0dcad8a9e5b4bea59887eb1207f5c3a368c48e5d00460da52f0bdfeb93eb48eb066fd170 SHA512 b70a87ea91ff7f1a673bb2e173b61be38d36d1e4fef7ac40cb9a7fdd8048fed8caf8d2c6d0db53cd16a4efeb7561ece0a189366a63a2a3b6292e40e7e4bb3003
-EBUILD sitecopy-0.16.6-r3.ebuild 2195 BLAKE2B d0d2467b2ab4416b377c568fce25fcbf9d89b1c927b49a0216a87b336e691ff62d46dd5c58924a03f0954a9e216e29d4b3242dc721261b869e53433432aebf40 SHA512 fca8d5534093bb631d5d9e182b925932b3acb4d107b5df1eeec4adc53aa7897184a2104e60c197bf33c84b593c4987531dba7e7a0eb3058056bd3f54b80b8f08
+EBUILD sitecopy-0.16.6-r3.ebuild 2194 BLAKE2B 5468484950091c31593a40b812ea773484f7ca356d6cce88840fc5a50043a5d1f09f0c1708310cb92a6435dae018b3b6cbe6211e735db4a5f0203c215545bb86 SHA512 5cdacd17366833568e7356a698e3a40850ceaa645d98959224901af95c201a1590246b5ab66c1d4fefe70ce63490a1b01a0961742156f69fb0c6b3d13c7ea06d
 MISC metadata.xml 692 BLAKE2B 07d5d18bb4a8aa24f5c41910c7c326cfa477f1a1bfb7d3cb48e7928d7b456362f66cfc97c2f4e8e3d4475ef4177de389f3bf2bc141a138306ce82737cfd5cb92 SHA512 f7d3322134d7a8a037c9c4a3842442ac0970bc1ecebbf3bcb4e8342119d36e603af1c4f162a9db25dae58207e0dfce349b5947c942b6bcc3a36e21740d78b682
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
index 20a0b9a21e47..b38b4ab5f08e 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="expat nls rsh ssl webdav xml zlib"
 
 RDEPEND="
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 0daac30afd07..195fca34acd8 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -8,9 +8,7 @@ AUX tigervnc-1.14.1-pam.patch 959 BLAKE2B 384b065ac6f273ff302f8469c039e81f0bc7a9
 DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
 DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba SHA512 d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
-EBUILD tigervnc-1.14.0-r1.ebuild 5648 BLAKE2B cf2e9b7cb7b3ae15f82751208af5a099f9473ec36a9e0245c55b229dbd0c60c37281a16d2ab1808dd52e97cc48d05dc5ea25f4a4bedfa1037643d052de34d6df SHA512 7c604be55ba944b2537b96cb76163da300f9a9e1f9dcb09f78f536885cc850a5fd154a8d39a49ad98481eb5b6f7be892baa9bcd8a62f02c9f081beae9a109422
 EBUILD tigervnc-1.14.0-r2.ebuild 5714 BLAKE2B c5d1883b824ef6ae63ef62dbe192c0b0b0d29c59161bfe74c44558b7b45928d00a97b2a2e2ea3ba3a1867ac3e9b311c31fc412312aa6c565937cfd6b01806755 SHA512 283dc18afaf801a2cacd4deda7feb865af4449973c9c2dd550035aeba9ad1fd2a5bc2f1e51f2bfd2e5ff62a86e15431a47dcba08c2c7e32a457d264c47af999a
 EBUILD tigervnc-1.14.1-r1.ebuild 5542 BLAKE2B bc1fd9d9db838cc27cf2c4ad12a792606fcb218c205b5d08eb492cec71ad0e26d09175ce1e635b9a449136ccbe77fd6d6ea8c8d80c0af1f4c508b8f79d8ca895 SHA512 aa4a2d6ce6b85019671aa4d44141709b83fae388fffedcf4a9f94aad999e1fed1a4740755df845d54ae209fc3555c699ed03dc1462a46d2ddab5f6d829c3c436
-EBUILD tigervnc-1.14.1.ebuild 5666 BLAKE2B b0e2aafaf54a75cedcbf6d6c4ad76a8e776b53077edf416858f67cf9d17ba1b2d161070b6080be9ae6114d71fed0723e3ff8a9b8f8caca6c82ecd24b5994c187 SHA512 9efb21ab42c8390e629b1b249e5aed3eec7d7e85cf84ca93df2329a71ba7bdfdff6b7dd5a191b616ddb91f5edfa3368d6de4572e8e20d597756350a9603475a7
 EBUILD tigervnc-9999.ebuild 5704 BLAKE2B 533c2e4e58426108e0436555d1849d17978c9a6135bcfe3778005bf692b789c390a7ff7dd43b3d9e7d8bc6d1b6ffb311350095918c3fca788bc6275a099b3b72 SHA512 f32eafb73811f138386e88b25f2649899cf12f8641a6f162e7e44de50afb22dc032782075f7e22409ff415b3cdc2163fdd1e3dc7ddf3632eb089487587ada51f
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
deleted file mode 100644
index 0353761e539f..000000000000
--- a/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-
-XSERVER_VERSION="21.1.13"
-XSERVER_PATCH_VERSION="21"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://tigervnc.org"
-SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
-else
-	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
-REQUIRED_USE="
-	dri3? ( drm )
-	java? ( viewer )
-	opengl? ( server )
-	|| ( server viewer )
-"
-
-# TODO: sys-libs/libselinux
-COMMON_DEPEND="
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/pixman
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	server? (
-		dev-libs/openssl:0=
-		sys-libs/pam
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfixes
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		x11-libs/pixman
-		x11-apps/xauth
-		x11-apps/xinit
-		x11-apps/xkbcomp
-		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
-		opengl? ( media-libs/libglvnd[X] )
-		!net-misc/turbovnc[server]
-	)
-	viewer? (
-		media-video/ffmpeg:=
-		x11-libs/fltk:1
-		x11-libs/libXi
-		x11-libs/libXrender
-		!net-misc/turbovnc[viewer]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	server? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-	drm? ( x11-libs/libdrm )
-	server? (
-		media-fonts/font-util
-		x11-base/xorg-proto
-		x11-libs/libxcvt
-		x11-libs/libXi
-		x11-libs/libxkbfile
-		x11-libs/libXrender
-		x11-libs/xtrans
-		x11-misc/util-macros
-		opengl? ( media-libs/mesa )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	# Restore Java viewer
-	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
-	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
-	"${FILESDIR}"/${P}-typo-VncAuth.patch # bug #938694
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if use server; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply ../xserver${XSERVER_PATCH_VERSION}.patch
-		eautoreconf
-		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
-
-		if use drm; then
-			cd "${WORKDIR}" && \
-			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
-		fi
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DBUILD_JAVA=$(usex java)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_VIEWER=$(usex viewer)
-	)
-
-	cmake_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
-			damageext miext Xi xkb composite dix mi os present hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-
-		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-
-		# comment out pam_selinux.so, the server does not start if missing
-		# part of bug #746227
-		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
-		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
-		elog 'OpenRC users: please migrate to one service per display as documented here:'
-		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
-		elog
-	}
-
-	use server && {
-		elog 'PLEASE NOTE:'
-		elog '	The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
-		elog '	~/.config/tigervnc instead of ~/.vnc'
-		elog
-	}
-
-	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
-	use server && \
-		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
-		optfeature_header "Install any additional display manager package:" && \
-		optfeature "proper session support" ${OPTIONAL_DM}
-}
diff --git a/net-misc/tigervnc/tigervnc-1.14.1.ebuild b/net-misc/tigervnc/tigervnc-1.14.1.ebuild
deleted file mode 100644
index ec1ec5f986dc..000000000000
--- a/net-misc/tigervnc/tigervnc-1.14.1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-
-XSERVER_VERSION="21.1.13"
-XSERVER_PATCH_VERSION="21"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://tigervnc.org"
-SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
-else
-	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
-REQUIRED_USE="
-	dri3? ( drm )
-	java? ( viewer )
-	opengl? ( server )
-	|| ( server viewer )
-"
-
-# TODO: sys-libs/libselinux
-COMMON_DEPEND="
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/pixman
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	server? (
-		dev-libs/openssl:0=
-		sys-libs/pam
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfixes
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		x11-libs/pixman
-		x11-apps/xauth
-		x11-apps/xinit
-		x11-apps/xkbcomp
-		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
-		dri3? (
-			media-libs/mesa[opengl]
-			x11-libs/libxshmfence
-		)
-		opengl? ( media-libs/libglvnd[X] )
-		!net-misc/turbovnc[server]
-	)
-	viewer? (
-		media-video/ffmpeg:=
-		x11-libs/fltk:1
-		x11-libs/libXi
-		x11-libs/libXrender
-		!net-misc/turbovnc[viewer]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	server? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-	drm? ( x11-libs/libdrm )
-	server? (
-		media-fonts/font-util
-		x11-base/xorg-proto
-		x11-libs/libxcvt
-		x11-libs/libXi
-		x11-libs/libxkbfile
-		x11-libs/libXrender
-		x11-libs/xtrans
-		x11-misc/util-macros
-		opengl? ( media-libs/mesa )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	# Restore Java viewer
-	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
-	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if use server; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply ../xserver${XSERVER_PATCH_VERSION}.patch
-		eautoreconf
-		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
-
-		if use drm; then
-			cd "${WORKDIR}" && \
-			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
-		fi
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DBUILD_JAVA=$(usex java)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_VIEWER=$(usex viewer)
-	)
-
-	cmake_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
-			damageext miext Xi xkb composite dix mi os present hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-
-		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-
-		# comment out pam_selinux.so, the server does not start if missing
-		# part of bug #746227
-		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
-		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
-		elog 'OpenRC users: please migrate to one service per display as documented here:'
-		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
-		elog
-	}
-
-	use server && {
-		elog 'PLEASE NOTE:'
-		elog '	The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
-		elog '	~/.config/tigervnc instead of ~/.vnc'
-		elog
-	}
-
-	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
-	use server && \
-		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
-		optfeature_header "Install any additional display manager package:" && \
-		optfeature "proper session support" ${OPTIONAL_DM}
-}
author	V3n3RiX <venerix@koprulu.sector>	2024-11-02 03:04:24 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-11-02 03:04:24 +0000
commit	37a097af13d675b83911ac006ee9ee22d2163f9a (patch)
tree	75294129093c3332ea0ba918643a3485b19550f6 /net-misc
parent	aac5e1b02ac846f5e1ce85f4f66fdec46aa9b0d1 (diff)