gentoo auto-resync : 02:09:2024 - 12:28:17

22 files changed, 46 insertions, 310 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d162b51e8d5f..8db671c64e18 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
index f5e53cfb1c06..6cf52037fec7 100644
--- a/net-misc/kio-zeroconf-common/Manifest
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -1,5 +1,5 @@
 DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
 DIST kio-zeroconf-24.08.0.tar.xz 44876 BLAKE2B ef95fff8d7e27d8d48aff732ff134e168f395a368e9264968819cea39be26c216db3952f17fdcd5be44f61184b7b3176b5fc5d502be42b9576f6665fce159667 SHA512 68a157909264c9c4a36f6c90086bf74a15024121170c8b9a8459866a192715937308f9bdc991eba61307cf0a771ac37bf40dfb32f369416463f9c9418542da9a
-EBUILD kio-zeroconf-common-24.05.2.ebuild 447 BLAKE2B 6cee0a0f4d7642edfda070b657459ddc498c5a3458a9c934646fe83daf053b34b2e763782c5245cfdeb69b2eaab6478476312703a162699ae9fd68868bee39f5 SHA512 b469931bc1f0457d49a7acf52340a6dd59d0e449c5857a819cd91de7a6e3c7504eb18e71ff9efb5e2afa8cae3417c4fa277a7776d91b4d76225aada14fabe26a
-EBUILD kio-zeroconf-common-24.08.0.ebuild 450 BLAKE2B e96da0725386e84d2d5b3af4603528cff9221a5c238d26e148349516c2ff264659d82c6076e9a249423085bbed488fcd3d788fb855480ce5c7d8072429953b5d SHA512 c62ad5501ab99989a0fa07cda01d92eee86247201cab9ddeff164d5c8a72e4bbb7edf6b0ed819320b90f6e6b4ce9b4a662c362dc39a6dac31f81aac995b1540b
+EBUILD kio-zeroconf-common-24.05.2-r1.ebuild 573 BLAKE2B c679f4f7ada6c6b0d79c25828ee48517cf3d44e5a40793f0483a217e358598fdb0389e74e5794967be3c5791a48c3043903477fcf3820992e7b85416e711f55b SHA512 3dd53dae22d62829e51fd28280b02c5febd03fa446afa247a5f61864eafbfdfff4f8526e8d9c667302b9db114cb48aaf5909fb28493e5c18e800a362f06b5285
+EBUILD kio-zeroconf-common-24.08.0-r1.ebuild 576 BLAKE2B 37bf7e5c06b94934c88dbde5c6de4c25b70a750b9564b690f68d4a39a90aea49acb6d3936e9a036651ccf2832351dd237f8f31c70ceb3940a89589387220101c SHA512 fa88fa458b701e256180f03165de38579e849e494b8a389cbb7933541a619ce5c70873299146a5d7f74f072eb22184e71cd32b6397620b3ba21e3d29ee5c91ca
 MISC metadata.xml 382 BLAKE2B 19f8c78ccf78582ea7cae867c450dc668813811f0429fedbad2fdae7a6f4ca7c0e7e5e2fe4d4e8987471fc52d816e6e31c6f30961f6f247f3b124c3a20a57db4 SHA512 b65cfb16894cfff9500b62d90c04b25693b85de026d2637834befb117daa4a7744ae033aa10b4aaf9ef04349f442a199be598e250e05e53253f6d30c6e37eb2c
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2-r1.ebuild
index 91fb277a7f82..f1f40621d14d 100644
--- a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2-r1.ebuild
@@ -13,10 +13,12 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 RDEPEND="
-	!<net-misc/kio-zeroconf-23.08.5-r1:5
-	!<net-misc/kio-zeroconf-24.05.2-r1:6
+	!<net-misc/kio-zeroconf-23.08.5-r2:5
+	!<net-misc/kio-zeroconf-24.05.2-r2:6
 "
 
 ECM_INSTALL_FILES=(
 	kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR}
+	kioworker/zeroconf.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	org.kde.kio_zeroconf.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
 )
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.08.0.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.08.0-r1.ebuild
index b07e670c3c15..4ab4638c9e5a 100644
--- a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.08.0.ebuild
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.08.0-r1.ebuild
@@ -13,10 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
-	!<net-misc/kio-zeroconf-23.08.5-r1:5
-	!<net-misc/kio-zeroconf-24.05.2-r1:6
+	!<net-misc/kio-zeroconf-23.08.5-r2:5
+	!<net-misc/kio-zeroconf-24.08.0-r1:6
 "
 
 ECM_INSTALL_FILES=(
 	kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR}
+	kioworker/zeroconf.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	org.kde.kio_zeroconf.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
 )
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index 395801bca42f..8d6de4a60cc4 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,7 +1,7 @@
 DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6
 DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
 DIST kio-zeroconf-24.08.0.tar.xz 44876 BLAKE2B ef95fff8d7e27d8d48aff732ff134e168f395a368e9264968819cea39be26c216db3952f17fdcd5be44f61184b7b3176b5fc5d502be42b9576f6665fce159667 SHA512 68a157909264c9c4a36f6c90086bf74a15024121170c8b9a8459866a192715937308f9bdc991eba61307cf0a771ac37bf40dfb32f369416463f9c9418542da9a
-EBUILD kio-zeroconf-23.08.5-r1.ebuild 802 BLAKE2B f3503fdce374b18a251213a9706e1e5e9f458e6c31a9258cc6091e6a5161a41fa9c7819ad663bdbab926d65b41747cc204bee050f12d0591ad622d8b4ecd1c30 SHA512 2dbf45f6b5cb56db4af826fa1c6ae9ecda891d269aa367ea4610ccc9e91c5ebed612bdf7aa9e3a6ef7be58233c83cd3ab925380b3c68e3ffde5408a9a14a975b
-EBUILD kio-zeroconf-24.05.2-r1.ebuild 812 BLAKE2B 7b3d8db6903be4f83bf529b3ea06410193b243a8926e3e4fce0ce28bc12d0bee7668e57a2a72af9960bbd22344e8c8568d3d7bacc4ae53a3f08962f54aa4cd59 SHA512 ce5581e22c727daf3693ba74c1953344185052c8671aec10a09732e4f2ec6c1c1d63b9aa34062d36d5951a59894d9cb05c6ce49038d12055702642e62f1e5455
-EBUILD kio-zeroconf-24.08.0.ebuild 813 BLAKE2B 670614f2aac9548b8383395d477a68a1a38f28ae86d7214b64dc9726b5ad9dd8f54eef85b0d12348a5f39119b403af5922182d50a032f3476d2c0b5fe2d69578 SHA512 651e4b2f109295ae363a12c96ecd3c2d0041c93fe03c17d16de0571b1bb9233651f2e5259e7002097473ec866d2d26cff0949ca0f449a16c0fe592d10cf5008a
+EBUILD kio-zeroconf-23.08.5-r2.ebuild 897 BLAKE2B 5ec0fbd21425a398b502398990944a517aaab0af2750326897f2439b540407b2aefa817e40e0969675096e7bc2482146c6029803cdb22184a822005235691621 SHA512 b5c4e1ac89b9fa4e3a74da79e068e5e4d71d14f3fefa283e8c4a79bba2f5357da226103a88c61957dd5a45edd6849bc791f76ff24a91f2aada479058a63fe632
+EBUILD kio-zeroconf-24.05.2-r2.ebuild 906 BLAKE2B 2e27aaf86ecfb9c90d8f625fa118aff7756ecb0d004fa2de0d349a6313fbca478a10da6d33d7221d7ed9063bd15d155a6a72bdf15abe1187f109a0076863ca0f SHA512 737ad74c4ce5363dfa8ab002b3817ff3f9c06046acd519f911a00f56052844d41f893cd3f79468fd930a16ef8007623cc8dc17cef8086af38682c8d5f9430047
+EBUILD kio-zeroconf-24.08.0-r1.ebuild 908 BLAKE2B ee09cbfb4cf487ac7fe0771c266e7cf6585cb53496da5c5845bb6a00df390b286af025b386aef989b40e4ef1d231c30095a8a7ae42f832825d88eb3d7b831edc SHA512 84628d3019eeaab0effb007c0ed7eebe44082e69cf1f301c67051607828567f4e6d384580b5990162f64257234cbeba53d37419200a689110404f2d6bdee5c22
 MISC metadata.xml 382 BLAKE2B 19f8c78ccf78582ea7cae867c450dc668813811f0429fedbad2fdae7a6f4ca7c0e7e5e2fe4d4e8987471fc52d816e6e31c6f30961f6f247f3b124c3a20a57db4 SHA512 b65cfb16894cfff9500b62d90c04b25693b85de026d2637834befb117daa4a7744ae033aa10b4aaf9ef04349f442a199be598e250e05e53253f6d30c6e37eb2c
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r2.ebuild
index 6724a7a9a616..79cfe2ecde6a 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r2.ebuild
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}
 # Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
 ECM_REMOVE_FROM_INSTALL=(
 	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+	/usr/share/remoteview/zeroconf.desktop
+	/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
 )
 
 src_prepare() {
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r2.ebuild
index 7ae08ed86209..0b224d476d27 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r1.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discover
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}
 # Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
 ECM_REMOVE_FROM_INSTALL=(
 	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+	/usr/share/remoteview/zeroconf.desktop
+	/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
 )
 
 src_prepare() {
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.08.0-r1.ebuild
index fe3aafc57e9d..1c51d9b1efb0 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.08.0-r1.ebuild
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}
 # Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
 ECM_REMOVE_FROM_INSTALL=(
 	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+	/usr/share/remoteview/zeroconf.desktop
+	/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
 )
 
 src_prepare() {
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 6dd970944868..8ab759c535e5 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -4,12 +4,12 @@ DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59
 DIST passt-2024.04.26.tar.xz 196148 BLAKE2B f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68 SHA512 f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
 DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae SHA512 04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3
 DIST passt-2024.06.07.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488 SHA512 103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
-DIST passt-2024.08.21.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488 SHA512 103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
+DIST passt-2024.08.21-r1.tar.xz 209692 BLAKE2B 1b6b540f64528e375e6f0cfd90cec788b2b2281f7ab6dbe0f6df933757dcc4f37e154b2cd8e9e00adbc2b647a044fca05f2c48f49d05c0443c396831a2e13754 SHA512 ec09210b471377cc9f3d0044c97924834fadcfed7523aaab2f6c0fddb2d3d098c0730d1573e7c44963334d33dba5fbf660b0b222d4c71fab27cebf8edb52abf1
 EBUILD passt-2024.03.26.ebuild 844 BLAKE2B c2e05676edbeef4ab811461007aed303b87d27b18554a9ffc5656b0d639ede10e72db6814c22d87fa69dfe21011e06fec7db0da89069c3ea6a9bc23a66f33dff SHA512 0623b6ac66e019528730130718c196e9e3a5366ab137d5b2a6b0fe43bea64d13249d33379a0716b1cf672bbf548ac70e9a0cd6aefd6fe3a0256da1f78653231f
 EBUILD passt-2024.04.05.ebuild 844 BLAKE2B e544e1473ed4de1f6b936b1fbf9d4ea26bab2d70c2fdfba57f54fd2ffc58bbbc65f873bc4581e918f3bd60d89ae159a82621db4a47a7ca0f86dc67bf29e41bdc SHA512 69b9be7ec1bb30f96db670bc9234e2751c54db6c225e5f286e36ae1e268192a7c53d1be9429cb6c4a3e5b80036c68bea016c85e6c73066a558dc602838246d3e
 EBUILD passt-2024.04.26.ebuild 844 BLAKE2B 10b3710ee5e339b0d4893fc78e987d36b81308c49990a90b102edf0bce2b1a96066d33e6f816efd883e93721fe4f234365c4c70a6e8545b849bca965e8ea5346 SHA512 9eba25469e37c8607791666bb52096b7be02dba073cb41417f3369be7b1f0f610f73305388033c717cd4a924fd64c601c2d4127cda51644dd414590ff91b371f
 EBUILD passt-2024.05.10.ebuild 842 BLAKE2B 981829c7ddff88eff3c19b694efa537718a3c49737b56f92973c2391eeeccdb3130f3d937bd859001c73fa1f3286a72ee0680a6941dd4654670587d49ab71d87 SHA512 7da8a2aeef7f17b05ab44d9672bac2c639a1b12905f1c2a7b77e67d1896d167ce561119737ac190514b3ccd0104f2ae4a7231b70c80fa0b16a4486fcecc42740
 EBUILD passt-2024.06.07.ebuild 851 BLAKE2B b52e1c96d5ae735911d2c40766297021034261ddaa1df17f9bf943c489372d4f44362ad2df6c04854f9f81db054985d24ab797e549289d8bcf6f2c825f2c3490 SHA512 af4539311892ccfacb91079b6d4c5ae3131ea5423cd9518fe8fb13f5207de48e2ea0e32d5232a43d54b02188d32cf7a8cf0af5ed88fd0ecab6af4d0216e17a80
-EBUILD passt-2024.08.21.ebuild 797 BLAKE2B 577aa2dba1df01d11893c8c85717382a98ed93426c4c1eb0205623cd16d0c51dfd4c0dd1c27b82336cabff2226bd8924530a2f73040e719e8ac5a8aa2e9fd928 SHA512 1ade75dbf665258ddde6bb66db68bb5dea803b381e95f04e6ee5fa042d42e65155144cf4c4fa9fade908525164bac61dc0f12e7fc5b5d0819c31551c01774a3f
+EBUILD passt-2024.08.21-r1.ebuild 818 BLAKE2B 7f17e0371007bddb7cccc1bd9bda87af8a7f1e6a56ae37c3e5a0d6cd3e1b17bc4050e53ec6bc82902cdc476f8b3642e36d9a9b604d775c0c8be173d5f55179df SHA512 85b441e4b42b02100108e368c410a880862efc25a01b06280a7cfc08d3db8d4797bdf416846a9a77f3092eaeb9e6e80a97127d1d86fc3c1f90fdbbc834ab596b
 EBUILD passt-9999.ebuild 797 BLAKE2B 577aa2dba1df01d11893c8c85717382a98ed93426c4c1eb0205623cd16d0c51dfd4c0dd1c27b82336cabff2226bd8924530a2f73040e719e8ac5a8aa2e9fd928 SHA512 1ade75dbf665258ddde6bb66db68bb5dea803b381e95f04e6ee5fa042d42e65155144cf4c4fa9fade908525164bac61dc0f12e7fc5b5d0819c31551c01774a3f
 MISC metadata.xml 1410 BLAKE2B 415cf4ab3e0d993066251ff9e136ea4a5ef13fc50b838b5dd057784600b5fb89fecb411cc0d61d08459e34da7fe34097d22b8908240f3e46e6ff50f503aa7089 SHA512 85d756f5b8077fb0838e1881f9ef48f08ca8da1ca540d8677632c81d34765d6fb1483b3fdd0eead64467aa7872b1ca133745610736d0afc5a2b8223abacc1cb6
diff --git a/net-misc/passt/passt-2024.08.21.ebuild b/net-misc/passt/passt-2024.08.21-r1.ebuild
index 056444e46eba..c5749fff3812 100644
--- a/net-misc/passt/passt-2024.08.21.ebuild
+++ b/net-misc/passt/passt-2024.08.21-r1.ebuild
@@ -8,14 +8,15 @@ inherit toolchain-funcs
 DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp"
 HOMEPAGE="https://passt.top/"
 
-RELEASE_COMMIT="8a83b53"
+RELEASE_COMMIT="1d6142f"
+MY_PV="${PV//./_}.${RELEASE_COMMIT}"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://passt.top/passt"
 else
-	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
-	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+	SRC_URI="https://passt.top/passt/snapshot/passt-${MY_PV}.tar.xz -> ${PF}.tar.xz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
@@ -30,7 +31,7 @@ src_prepare() {
 
 src_compile() {
 	[[ ${PV} != 9999* ]] && export VERSION="${PV}"
-	export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}"
+	export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${PF}"
 
 	emake $(usev static)
 }
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 14fcaf007c15..e95dca177449 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -2,5 +2,5 @@ DIST smb4k-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz 33212 BLAKE2B 774f5
 DIST smb4k-3.2.5.tar.xz 4314812 BLAKE2B 9c5ca6f3d9607be1e5673f7d32a8dc5f191045ccc5607a4ccd9d48d07fc698278db5bbe5e8ffcc4fa9a1f390d52e7ebb877bc01146754873af5d3c266aad16d2 SHA512 6273c9701cf3d65f9b1d7ce0cbe929dc8f422b6a7a308f0b3c4c08e30acf2d189bc1ef4f960dad25aaf71b38b29ce6c41ba8adf50f0bb139e25a0d65a8e67a28
 DIST smb4k-3.2.80.tar.xz 4345084 BLAKE2B 117074e852c6393ba07f71ab0561c61a41d0a45128aad402a5baa3a41efefb8e2b2e984d69f04e44a1940678ea404003685fe83c2cd36bddc1cbe756e78e6833 SHA512 46acd2adad4b7e8278d6fdf4ee31691a75b88222188271975adf5391d7767af8e7617695a51c2536e621f57db97627e4ab3db1953cdc6cc475dd462b5da2836a
 EBUILD smb4k-3.2.5-r2.ebuild 2331 BLAKE2B af60be9eb3e4e56f163b794f7560d59d1781574b6379c1472f9b959d9ea8c6862d3c09a17784b054c82a9970f4e0794a9ef91b21a2fe0a07ef7ee4238998b12c SHA512 e5d598f4157f8ae0b0e436385f8859178a9b01a253dc916d1a1f0172974425619886641ca0890ac2df17823b278923a5e22913e754fd3bf1267c3be7183a9c0e
-EBUILD smb4k-3.2.80.ebuild 2086 BLAKE2B 313089bfeeda1f47aeeb1e1dd953d964c7420f1afcfb9b4040aee963bb0edfd000600114f1bb532c4e66ccb0b47761faf040c7e54eb69af49c422d196dfa4175 SHA512 4c90fbc849f286b5d69b33aafb4cf36fa7114d518efe6acd8ae0c9df249dd0a3ae22a81384fe38f24cd925ed5735b6d73d8e28a9550cd5282c98114988ad8216
+EBUILD smb4k-3.2.80.ebuild 2085 BLAKE2B fc5828fdee91672222f4dfcc460e6848f3681152f7b59b8545d3a0a4114866075b20deb2ad953b3fe1b65342b50547379b1f0601582dbb7f4a45924e88fd196b SHA512 72b83adf0f068742b7de8679d32eac17d1c6faae7b549fa64369145497e7ee75f1d4c21dadb4e415e9e7a3cbdb9af9ae6401d3bb441a632e6cbce6a7282b83f7
 MISC metadata.xml 593 BLAKE2B 087dedf151163d8d8f02f41a9aa08117219c50556e3e60c97bf3bf3175fbe41fe9cdc1f0ada27aacc660095b41edfcb9502d02568bcd9eea26e8cecdbceaebe9 SHA512 f090b6f9b968087c912cc88187089a0eb891e77713fd5aabed03931b9da6f2f6673e48b37edf57de5da3a421f25d82371f9568db302e9e35e64f5f8200a2418e
diff --git a/net-misc/smb4k/smb4k-3.2.80.ebuild b/net-misc/smb4k/smb4k-3.2.80.ebuild
index 74ecd14bc4c5..71945febd679 100644
--- a/net-misc/smb4k/smb4k-3.2.80.ebuild
+++ b/net-misc/smb4k/smb4k-3.2.80.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="https://downloads.sourceforge.net/${PN}/Development/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 8d1832ffb878..c76a939ea778 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -2,7 +2,7 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4
 AUX spice-gtk-0.42-libtool-export-symbols-fix.patch 2413 BLAKE2B afb7fb5763d28f9666e71ff55b3d66587922175bc518396a18cfe97544b3871185d51c170287508fc4a47e2ebc8ca0cf39ebdebb829b5213432eb15019a7e587 SHA512 df284e95f970149a75d87dbad6e06899e80f68721979f91b3246037b37e432e48beab832fe3d376814681f9e11611b9f4c3d3463f969f32c171879c2e6cd1c38
 AUX spice-gtk-0.42-lld17-fix.patch 5913 BLAKE2B 424f780a9e8386d9b7eacccc012e490cec4d62274d7d01269121f46c16eaa63a99280bd05adb36671151dc1ade3adffb44933546254812961e5633767662b613 SHA512 a6859c10cebd5be3e6661f5b2558e571f15d8d53fbb0bba3a40364632473043c6045e17f068d71135e4e61a9ea7d641f0aa0ca6eb6e0499f4aab168406e2b48e
 DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137
-EBUILD spice-gtk-0.42-r3.ebuild 3991 BLAKE2B 7363ae47a07944a1f84f74f00ec0dd0375968e5c51747ec0d383f821390a3ec94b3dc3b93f782f9e348836d395954a573158885aa3d094f385ea70fb67b2392b SHA512 2744690287e81f8614fe88444e3d2a468197e6ec78a375b44de3881a2f40ccbb3fe82edff9658d6e2d393bf504317eedfe5709c17a5acfdcbad69cb91b3f345c
-EBUILD spice-gtk-0.42-r4.ebuild 4033 BLAKE2B 1f56bb534361af8c508eb2d45959c5581c6f525ccceed291342f9c39735f258309b9ad31d603a70095f1787c29946d3988d7d2f7f42ce2255f0bb73b91423523 SHA512 18f4f3743976718b2d9b59a4fe785c073b73a3230894ac9d17d33b921ca620bad701b990944a6011f143ad7ec3632b5e53e44e2a29be52508d810c0e5a403fb5
-EBUILD spice-gtk-9999.ebuild 3923 BLAKE2B 52e108cbd8a0f818123beb244ab8df538d9173a479d1f4ba27069e5a1a135736ae38905231259f721892c6a2d2216bab5bda34d137f15db17fcdd6064cf471d3 SHA512 f4681c903728c00a5406e60f5a9df363adc637977148b3cb87562cd5bd1f2526b904f564cbae4173e30aadcfae9c22c7bd21652cb3467ea28752cca6a98d3a91
+EBUILD spice-gtk-0.42-r3.ebuild 3992 BLAKE2B 9536f417b9a8198fd698d9f0977e02388b54d61920b38e9b6991afaefe990cad25f70cc722d82416d583e5fc975f75a087a59b7db463fdf8e53a3ff60097e8b2 SHA512 c765b38de66e6e3636047ba65936118c137cb06211e2040a619fd785dfe93b39a6b90f39ef4b36e190cda35e072ff35afa5e26d23d8faa8f5908e296aafd7f05
+EBUILD spice-gtk-0.42-r4.ebuild 4034 BLAKE2B 921d196ecdfadae472eb66152c9617344d92b21402f776f31a96cb003c53437673ee7ba11e040fb74ada2b28c290bbe8967e96899ec3eb70855ea7bc6557328a SHA512 9fb557ad32ec71e6eea6376744526f7428fb0542e8fbc8120b000bd16b902468d90f787e5d65e90ac74598ce404cef6da5e54895fbb73ecda2379f162ca566d2
+EBUILD spice-gtk-9999.ebuild 3924 BLAKE2B b68514380188f49edf1354e5cb18ea98ad4db4de30e8bacd35a91e4cd1fc8f172b1bf99dfcb8453176e12361e4cb860c290011194a8817ea66aa179bf0554b71 SHA512 d6135cf2bba117ec8d80accab25c47a6177330b1873b09c619498cb12398bee21a0d723ec7bd40a072c429ca21c355ff4bc51bfdbd0c591dc6bcfe9b70f85c35
 MISC metadata.xml 878 BLAKE2B ed1c920773825632995e541e6bc7ec0b894005edcff41c90c2af4a47279db54bcc695b22e91e7aa3c1376cee6ed509f985cb7486a2f7d75e8b6ebbb8c6caa67b SHA512 308ea78d044e3c13ed40154b4835f202dc523fc8925aa3ad0304ddb6518a9c51437ebccc539998b8d55d6919649358a073b5c80a2e8dd0d8e82bb4e0ab6c6d0a
diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
index 784cfaef5d9a..97e84321b8f2 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+HOMEPAGE="https://www.spice-space.org https://gitlab.freedesktop.org/spice/spice-gtk"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 	inherit git-r3
diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
index 508b80c65082..fce7fc5c833f 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+HOMEPAGE="https://www.spice-space.org https://gitlab.freedesktop.org/spice/spice-gtk"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 	inherit git-r3
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 5f81513a6c11..69199a32af5f 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+HOMEPAGE="https://www.spice-space.org https://gitlab.freedesktop.org/spice/spice-gtk"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 	inherit git-r3
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index cb78f081325e..e1e97cf17aa4 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,2 @@
-EBUILD tigervnc-xorg-module-1.13.1.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
 EBUILD tigervnc-xorg-module-1.14.0.ebuild 453 BLAKE2B 361d1d0a67e110766725b268cca0f4d2aef2d2f0c6c6fd52fef4cd543f8df3f69b32c2a6afb41081ea7975852ff76120f2d743345312f4fcc30390ee791b8b82 SHA512 12edcec0e1996d92cd7fe9ca8965a8b3ac170ec9132cc9923ebd2199ae6e0ca9c70a7fe8c850b4968eb19e2c28b00b1830723f21ce05b9494e34b81bb89e4747
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
deleted file mode 100644
index 48f881ebf961..000000000000
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
-HOMEPAGE="https://tigervnc.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	~net-misc/tigervnc-${PV}[server]
-	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
-"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 600393a96403..546e534e9d48 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,4 @@
 AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
-AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 AUX tigervnc-1.13.1.confd 518 BLAKE2B ee5e354a36638850595cda0c4d083c6837609201cca520175f78b03aa8cce18c6b89f534cdaf6c409ecd5aacf0c0115a52ebd458cc4aaa4aa0ba19942e2352cf SHA512 57db5b7ba590a48fc7e91da13cbe2ff0bf6e96088d522d214f6dc5266ea9dc214c561c9705380477f25d65eede870ef3b054fa77fabac78cd5ac449204e07b59
 AUX tigervnc-1.13.1.initd 2635 BLAKE2B 4600e73a22cb774030bcb0f750a50b134f06183a30008781e78c5e64034ab4ae8e5598e8e65f01c2bee96276ded4ec583df73f5eee0bc1ff1e8c2524af9ea6fd SHA512 acdbd97e3f559474c0c5b9211a8a3885f70d7d59a89c236d01b50490c6c2a70c4b7f9c2346f161640b09123cadb8803f0cbe9ddaa0efd046bcdd00033f133673
@@ -7,11 +6,8 @@ AUX tigervnc-1.14.0-typo-VncAuth.patch 763 BLAKE2B 6e0f209159aac2f6ed78784606b7d
 AUX tigervnc-1.14.0-xsession-path.patch 1008 BLAKE2B f73bbab10b21a8b27b5b1773e43b254ca5e5017efd84aba8916ad6b5549c2cffabcbac7c14c0b1d8dbb2fb280299d580ceab45399b593abc8f520d692988024b SHA512 cc3ead0af6c618b00914a131723fcf401f913a10e3398e92702387e805dc94f7878558deff4ee12d58e8f2608a7d268ba937a8fcc34ed303b9e3328e77b98bf6
 AUX tigervnc-1.14.0.confd 530 BLAKE2B 1152c237744ee69ab317a8d979a8282abb259cb359500b251c31faf6a683ec11c31ef283749e420f5fce54a9f5bec7e97df4ccfdae41871173d30458c8669137 SHA512 75dbae29d2bab1e1b56f9d2d73bb674cbd968a9919e085bc1d356726caed91b469474753176d657c0b5ef2afe6fdf691b661d2224062b22bc39a9752951ac6d4
 AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251d520cc5d98cfd2c2f075737fb3ed192903a08f850603847ce7769e3ae01b2c29dc4591cb3444edf835c6e0d SHA512 0e4043df37125e48d4314fc87400bf5e4eb9ca9848d2afead2f34b4f94422a03b939c3cf246a40c44b91e9cf0aec261f35a3c98e9861810db2f5a73f384a3c60
-DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
-DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
-EBUILD tigervnc-1.13.1-r3.ebuild 5432 BLAKE2B e9104059ab3ca717699f38329a8c428f24f7ff9d42ebd27181f30f0dd4bad7ba7af86f7e1a75406a0f08a6570cf1bed9ee4d03c50f266d6bf9c681d1b7bd2c86 SHA512 b921c52372954381ae535c6c7e9fa518c31f33a62e13a63ae9cca0f0fd210f4efa40d769966d86a4c3d4ad71d6b2d0caa30de6fd4d4b1de61f41faedb87e803a
 EBUILD tigervnc-1.14.0-r1.ebuild 5654 BLAKE2B 07d66216434342d7f49e8d2305f503f29d70144ed9ab301d2ad4cd2742efcb75236aa72ad1811724de797379f98815b5ec682cbf52a204ae15dfa522c783c2d1 SHA512 27cbe12e11d1ef6e128fa72ce1dcb4ab70872ac73fad6127a803d5e30087221cebab5ec149b86f1ff793948fc015bb91587351c3b161ce03264904ec7fd8df01
-EBUILD tigervnc-9999.ebuild 5451 BLAKE2B 969ff59f69636c982e7c4bbf6fae54941b1d0f71950135d62700b31d28166e84708de6a4d5b0f3f3e0e3e3b05f37a3e5b7c15a3ad9154a1c8709f7428071b1bf SHA512 7fbb6c3eaaafb0284816e6a0c93524991f3b4d506cf93d3e3563b5f4da5264b8541e27a5420fcc8716a252b78694ecffc1b2eae0834d5f4b1057b58971db08a0
+EBUILD tigervnc-9999.ebuild 5606 BLAKE2B bcaaa94235e07852da83c4e511517c56b0258c5e9b7a1f7520f47e3b77ad2258b87f5f0ca5f8181d23de9c3f7c2262001e90c8b0544e50ea0faf363fa80ca438 SHA512 d0e34507861494b11ab610f76f0ed062ecca79fb27418bd76890cfc23e53a7697a2bf655c9a0af99fd5936cb93a3949d0aee3c9c8cb632f496d1959582f822cc
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
deleted file mode 100644
index bfcf6ceaef16..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add more possible paths for Xsession, depending on which display manager is
-installed.  We need an Xsession that executes its command line parameters, so
-leave xinit last.
-
-See also https://bugs.gentoo.org/746227
-
---- a/unix/vncserver/vncserver.in
-+++ b/unix/vncserver/vncserver.in
-@@ -437,11 +437,14 @@
- 	die "$prog: couldn't find \"$cmd\" on your PATH.\n";
-     }
- 
--    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
--        if (-x "$cmd") {
--            $Xsession = $cmd;
--            last;
--        }
-+    $Xsession=$ENV{TIGERVNC_XSESSION_FILE};
-+    if (not defined $Xsession) {
-+	foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
-+	    if (-x "$cmd") {
-+		$Xsession = $cmd;
-+		last;
-+	    }
-+	}
-     }
-     if (not defined $Xsession) {
-         die "$prog: Couldn't find suitable Xsession.\n";
diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
deleted file mode 100644
index 62d96695236a..000000000000
--- a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2023 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.8"
-XSERVER_PATCH_VERSION="21.1.1"
-
-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 ~ia64 ~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/libbsd
-		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.12.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 's:\(present.h\):../present/\1:' os/utils.c || die
-		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 \
-			--disable-present \
-			--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 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.13.1.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.13.1.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 && {
-		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:'
-	}
-
-	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-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 24dd8515063c..dfc8ef4f5e0b 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -44,7 +44,6 @@ COMMON_DEPEND="
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	server? (
-		dev-libs/libbsd
 		dev-libs/openssl:0=
 		sys-libs/pam
 		x11-libs/libXau
@@ -97,7 +96,7 @@ BDEPEND="
 PATCHES=(
 	# Restore Java viewer
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
 
@@ -198,8 +197,8 @@ src_install() {
 		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.13.1.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.13.90.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
 
 		systemd_douserunit unix/vncserver/vncserver@.service
 
@@ -221,6 +220,13 @@ pkg_postinst() {
 		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 && \