gentoo auto-resync : 11:06:2023 - 14:17:09

25 files changed, 93 insertions, 1081 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e186dd8882dd..c7b9881e75d4 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index b5209c06143b..883434505ebd 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,6 +1,3 @@
-AUX eventd-0.27.0-fno-common.patch 323 BLAKE2B a6ddf695edf40bfb6a1b247d0a82d899d5162f3b59ca3a5879b300deafdbdae31557edea1ccfc4bc183cc1e9d3ea2124305951ad29dfab15428cf9ba0fab4997 SHA512 5ca3560d6b046debd58ea682d302f22a9884426112cecedb577b5f1da5de10489f435f55978affaf6fd69d43d72d547f617e141b209d9e02e32651286afd639d
-DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302
 DIST eventd-0.29.0.tar.xz 196276 BLAKE2B 5d9fd352df65a8bb00e6bf1f7600dadc1bf3d3c98ed02eb3ad3cb6148dc8370dd2bc2ecda7e2b8f60d90b7adebb2187490bb6c934bc0bf8b5d0cd38bb26a8c36 SHA512 32407049df0abba68eb6310a86f8c6ec42774bd55934e5927d92f9eb75fc11f32e790904641a0113d8668c66591a0a82246b3240ba1a9517b243301bb96227b8
-EBUILD eventd-0.27.0-r2.ebuild 2662 BLAKE2B 6074a07d9812b093a8c27c14cb4e5f9e57595befe314209049a85e86c822382aa6bccc137c3eadde3189b58d4ac4f3bad4a45192d9598fa9ac8de2f8ef17abea SHA512 e66615b2fdcb7e02fde31ed67583294e78b7d2d2552ea1016e871985a5623ada9228e04b069a2f83f37e6e2905c3aee0f4081efee8919a4a7dc203dd027d6b14
-EBUILD eventd-0.29.0.ebuild 2627 BLAKE2B 2b1188731f35f798ba884ac46031f05fa317ecbd868daa4dc0056f8fdbb2cccfafa87822ca8262927a1ce8bbf9df33691cb9639a54d49892fa6b2a0160d31f1f SHA512 3bd79a4f34bbed80930a88bdcb55e0074b03f5de0297db999e14d5068efda378b2b3f61fc0bb9e00d924d1d841b9190f6da71a6a491f5ff67bba7e04dc96fafa
+EBUILD eventd-0.29.0-r1.ebuild 2624 BLAKE2B 5d967ee2a64345248d300268dd8fc9cc40c1b3d9adbe32a16261c3c89ef6bf5fb28e616307b139fb060b7bf39ef2ac4389da26e710b03fbc5480db218d7fe8f7 SHA512 22f4b7daf5f5a4d671d546782174fb356be5bff9dfb61a580e02da285ef71d0e48a0ca62f41a665b76aa12ce3dd3f16cf5b038319830d6f59d41bf0d3e120ef7
 MISC metadata.xml 908 BLAKE2B 070d6de6db62dbfecb990dde8a928f4bafe44f25c208f1136a600992c90a7978787df0f77f1ed82cdc203430d428fc4371136ab13ee5672090f6cbd6cf13bf40 SHA512 db11d00d0d0d04b2265340fcf4d28d73ed053135a8c7e40b6f1fbb6c22c23a9cf777c0ba40540d38de103c04744cc4354abf0134fdb3c325e8a733179794073d
diff --git a/net-misc/eventd/eventd-0.27.0-r2.ebuild b/net-misc/eventd/eventd-0.27.0-r2.ebuild
deleted file mode 100644
index 562deb09c326..000000000000
--- a/net-misc/eventd/eventd-0.27.0-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="A small daemon to act on remote or local events"
-HOMEPAGE="https://www.eventd.org/"
-SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+ ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
-	pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	X? ( notification )
-	fbcon? ( notification )
-	notification? ( || ( X fbcon ) )
-	test? ( websocket )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	x11-libs/libxkbcommon
-	introspection? ( dev-libs/gobject-introspection )
-	libcanberra? ( media-libs/libcanberra )
-	libnotify? ( x11-libs/gdk-pixbuf:2 )
-	notification? (
-		gnome-base/librsvg
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gdk-pixbuf:2
-		X? (
-			x11-libs/cairo[X,xcb(+)]
-			x11-libs/libxcb:=[xkb(+)]
-			x11-libs/xcb-util
-			x11-libs/xcb-util-wm
-		)
-	)
-	pulseaudio? (
-		media-libs/libsndfile
-		media-sound/pulseaudio
-	)
-	purple? ( net-im/pidgin )
-	speech? ( app-accessibility/speech-dispatcher )
-	systemd? ( sys-apps/systemd:= )
-	upnp? ( >=net-libs/gssdp-1.2:0= )
-	webhook? ( net-libs/libsoup:2.4 )
-	websocket? ( net-libs/libsoup:2.4 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	fbcon? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/glib-networking[ssl]
-"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.27.0-fno-common.patch
-)
-
-pkg_setup() {
-	if use ipv6; then
-		CONFIG_CHECK=$(usex test 'IPV6' '~IPV6')
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	# wayland disabled due to missing dep in ::gentoo, wayland-wall
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-		-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
-		-Dnd-wayland=false
-		$(meson_feature websocket)
-		$(meson_feature zeroconf dns-sd)
-		$(meson_feature upnp ssdp)
-		$(meson_use ipv6)
-		$(meson_use systemd)
-		$(meson_use notification notification-daemon)
-		$(meson_use X nd-xcb)
-		$(meson_use fbcon nd-fbdev)
-		$(meson_use purple im)
-		$(meson_use pulseaudio sound)
-		$(meson_use speech tts)
-		$(meson_use webhook)
-		$(meson_use libnotify)
-		$(meson_use libcanberra)
-		$(meson_use introspection gobject-introspection)
-		$(meson_use debug debug-output)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
-}
diff --git a/net-misc/eventd/eventd-0.29.0.ebuild b/net-misc/eventd/eventd-0.29.0-r1.ebuild
index b475370e4e82..0733249e9b62 100644
--- a/net-misc/eventd/eventd-0.29.0.ebuild
+++ b/net-misc/eventd/eventd-0.29.0-r1.ebuild
@@ -43,8 +43,8 @@ COMMON_DEPEND="
 		)
 	)
 	pulseaudio? (
+		media-libs/libpulse
 		media-libs/libsndfile
-		media-sound/pulseaudio
 	)
 	purple? ( net-im/pidgin )
 	speech? ( app-accessibility/speech-dispatcher )
diff --git a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch b/net-misc/eventd/files/eventd-0.27.0-fno-common.patch
deleted file mode 100644
index 5f731666738c..000000000000
--- a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/nd/src/backend.h
-+++ b/plugins/nd/src/backend.h
-@@ -37,7 +37,7 @@
-     _EVENTD_ND_BACKENDS_SIZE
- } EventdNdBackends;
- 
--const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE];
-+extern const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE];
- 
- typedef struct {
-     EventdNdContext *context;
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index d133d736f0a7..3793f3a78b76 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,9 +1,6 @@
 AUX freerdp-2.10.0-ffmpeg-6.patch 1195 BLAKE2B 49868f42ab24d0754bd11550c5ffffbdf90ff88561f48079d225980de7229a8f3ff8fbe9238d05eff7595405b303c6ef8728b6c29aea863950087e2f9b6aedbc SHA512 de6c8a7c1b31e0da4db5838bcc9607e55ff2c3e780f8924a67c610f85366385d0a91332972750c692136f1cfb6dd9ba009e1615346f2f4834afafc40a85f6dc7
 DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477
-DIST freerdp-2.9.0.tar.gz 7319428 BLAKE2B 358fcd14bd42b51d4d50e86cc71f9759179c82b466dd78a2f6996db84f3dd90495047f9c0da9a683edf894fdc96f4945237ad2fbeade12b173bac82f7be722b3 SHA512 de593640d4418c9395455b84c463e4cac8e51e9fd186ed5bce28132170ebc3c7338651582e0cc00272b530ea6e7c2664e802d748b3f6eba5fbe534dcf59d406a
-EBUILD freerdp-2.10.0-r2.ebuild 3150 BLAKE2B fa5aa6a55da88dff58690bfcfdb8914274b3a2b8371c82df3dcc285caec68b0d1dc7e895a3be87e44eae8e89836e6b1d575432fdfe69a937d077825290ae0d2f SHA512 c6440ee296fee622756266fb121986a1fb1aae2ae449139801dce586048a1211fd6ba2764b69a457ee473e950b16b9db63a83ca9b2ac2dd1bdd92e4a9a6a82ea
-EBUILD freerdp-2.10.0-r3.ebuild 3204 BLAKE2B 604b19bf176c159bb7affb17d277ae117770f470617dce04c266da8bf637424f6aa491f42de1cb7ce842a98d0b33088c3ad1b03a13452e8a90e9d2957aeec8f7 SHA512 412d52543fe1441eb697774b42c5587ebc074a16e499942fb5644a0b95bd08059e1c71c73e5437d2284cfc7f6aeac603ce7f7a02bfdfd5bbdc7ba2a6bbff794d
-EBUILD freerdp-2.9.0-r1.ebuild 3057 BLAKE2B f1c0022a3d69e2fac3e2a595054ec82f33923e37649068a09cbf09776fc6a7d787cfcf128a70a14c96360512b746f5e3a0b089be4e61d9dd9d31daede9d88605 SHA512 539389b49f50480e820aaa62e764ee82d8bd0b65d18deeb00ba35589ac36a268b019613d3b9e1c1786176562d9a46d1f9f28cbd6e9f61e8259125aa445e6ccd8
+EBUILD freerdp-2.10.0-r3.ebuild 3198 BLAKE2B 1e5b2b274b6efcfaff80b5d352d9103106accb47bcdb244583b02497e017dd4f85db6064bf9886238202a8fd42bffe353043b2393bd1704fc8cf4ea47bf2d769 SHA512 8bf81d0b6ced110078597aa599a42a2443503ec92163cd1d6c362983d4349cff13cbc45d6d19ac209c365768d31d751d78a51b2b2be71c3c839019583b12bd45
 EBUILD freerdp-2.9999.ebuild 3156 BLAKE2B 6506d72ab8f4f6fbf5e593e725c125eb3ecb517937cebd8d71d48c288c0559cc373b972d64ca044b89090f35aa403283411018a77e9c551d72aeaff40a8f0243 SHA512 5c264d667c50707e1eadd4687f4ddf691b613103377415b0722b0f67fbe2aab8a0bb46666009938a0dfcdf85b322dc5e044fd8078afab7d556268b4b8b8f7f57
 EBUILD freerdp-9999.ebuild 3154 BLAKE2B 0969565f458a7a676c1cbaf95cc0001545a5daf506f6bd1bb0364c1cbe8218f35a2249a9ed6d7e8333a586b8713ecef77f9c498ce17526d048a81036c46e1408 SHA512 1410eef326a45efed067381e9545886f6c15e4e5e0119b3495c58fb6ab91b2a84d0fb8cd91833cecacc2c1f66ae0847ea68850cd21ec70831af4a6be7897c7f4
 MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
diff --git a/net-misc/freerdp/freerdp-2.10.0-r2.ebuild b/net-misc/freerdp/freerdp-2.10.0-r2.ebuild
deleted file mode 100644
index f812a1150e13..000000000000
--- a/net-misc/freerdp/freerdp-2.10.0-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	cmake_src_test
-}
diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
index 7e92eb90ea30..43ab24447b5e 100644
--- a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
+++ b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-2.9.0-r1.ebuild b/net-misc/freerdp/freerdp-2.9.0-r1.ebuild
deleted file mode 100644
index 85a2e5f54e5c..000000000000
--- a/net-misc/freerdp/freerdp-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	cmake_src_test
-}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 98ad1484470e..93a45b9b73c3 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,6 +1,6 @@
-DIST gns3-gui-2.2.37.tar.gz 5048202 BLAKE2B bfc26350b60f7f790ab603bcc27ca4432bb4b19d92a3bcd766aa6739a332599afb5f710ff209b708a71fb4a4f515ce3f215434c025418989410d3dfa3a80c294 SHA512 800d746ba90be06260fac8f2a9db471da47aff66f10b94cfa46053d93820ba3e06b8e7146829de1bf7e8b09f83f4a57965bc044e0683f210a5cb3faadf9d4dd4
 DIST gns3-gui-2.2.38.tar.gz 5048241 BLAKE2B 975e0cf324afcc37a23e8bdccbb7bfc5e4a70b754a145a4948440e9fa2ba13fee4ce712ac18c0fce07c337946198f45b2555113f23073c5d91eed2356a7397a2 SHA512 a4ab6683864ac16cab34c695e5dbb9c21f9644ab048f4fd1bab902c7a24531d1f6046ea6b83e4fd9258f5db481f9b30ef600e66e7f0502ab09b66b15f6562f14
-EBUILD gns3-gui-2.2.37.ebuild 1031 BLAKE2B 1630b476df944bd2eb563cc2b95624f8c52e5c31f9032f3a7ac94ef886a2a045a007826c5956115b5d6d0fbc05e729c89eb3c7567e2624d5c5baca86a4f815a4 SHA512 80275662a83ceaf18f1c7dd75a380e58ed4e007bf328c594511df173cc0d8189cb861ce6468339b014ce4134b283e26d06f4704af22b6d1d30d4e9a929de3c46
+DIST gns3-gui-2.2.39.tar.gz 5048376 BLAKE2B f3edfbd2f35297a63372ac7bde8499d15ec0357822aaf8e089a40eb9227861dae80a2dcefc26a0fc9fe0c064bd0eb6e547901c6d7c1408739df142d8ec45c67f SHA512 99fe925b96bbcfc0c040dadb9ce5a47a168d6e9ce9031d6884acea05c7384247d404115124a5d095147f0a189929caaa278c83b7b7d9e324da3785cd2df4b4c7
 EBUILD gns3-gui-2.2.38-r1.ebuild 1024 BLAKE2B ca8b30a7097964d0fa787cf7bb7ad4efb0a70cf0b7d395b6d037ab4bc80d4f945501eec38652ce4b44ae260b594186e0a69ba188cc66f9688d1ea34603023716 SHA512 0e7cb3df783beeef9c0cd01b2476c0d8bb5b19a6c510ea93bee82616ae489f6d99db0fc374d08dcbb946390f25d89869a40013ff68c58376bf35d30cba2a3cef
 EBUILD gns3-gui-2.2.38.ebuild 1030 BLAKE2B 430d3e4d3014005b837bebc13aa18171efc86df91c0ec6ea99bf21b58df4c3a72e442ed798f2e41661c1efbc5025383b6f6974ea13ed059ba540361b2c1312d4 SHA512 925fe3c63330252c52557cb994ee6dd4222830c446b0ea3be2737f37bfa2dc2bbd20a9e41c69d1ef58da5806c8f4bd94c6f50b21d1a021b397c03016bc919a48
+EBUILD gns3-gui-2.2.39.ebuild 1024 BLAKE2B fe119ac3771d363d4928f04deab42743c920c8ed8730887f25cde4f4aaf64d9fc6d35b86f9bc0e7deb043447ad55192a6822bf8a6abaf5024ec546b06f22b72b SHA512 904465d74b5a4925c92e1b3292e9084ede2da03871a1bb084e625411fb286fb8047c8e20d1413c8b5c14ce6f20b1086278f8a9106c4469ebaae3efd457e71a7e
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.37.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.39.ebuild
index 650a3b5a099a..cf7bab6c850a 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.37.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.39.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_11 )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 virtualx xdg
 
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
 
 #net-misc/gns3-server version should always match gns3-gui version
 RDEPEND="
-	>=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 2256ee616ca9..018d2e528b05 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,6 +1,6 @@
-DIST gns3-server-2.2.37.tar.gz 9690092 BLAKE2B 9cc7dabde818996ea87494cb4a61a4ba5f9ad2dfe028a4ca9d45e9bd8f6dd4a17b4845275a87386ad068be4f354f932e6cada8d2b8eafd54230ea82fae3f5571 SHA512 f56d1f130e3179fe250b12e9459d8b66745c780c94380cce0ed60206918458f4aab119faa77b23ef7c58115bee11ff2ef6630539b5f184ab2d36b936564de1b7
 DIST gns3-server-2.2.38.tar.gz 9693834 BLAKE2B a7a442142bda19bcdb9c9501963bacc275105221f141a59f125d6ec37ada6b357885f76a8cd68b5daef1eb82a3d01b49a99a9c5d4383b728c5c156f92ecdd0bc SHA512 c116dee5836d76be03e5eb7be402b67f8f22273a9a6270220c77ca57324a991c1d2bbfba4457616b11dd2ce14c17206864ec46bd8d4ecc905ab9b20ad137d1a6
-EBUILD gns3-server-2.2.37.ebuild 2079 BLAKE2B e46367dcbb45b02b11508f74f22e607f6f5639663e8c843cd5d8a76a88fc62fe1163b3fcd1a60d4fcafb1e14451ec05c56fad285a1ef3364c9c8cdc7b3526c05 SHA512 18b79dcb6e722aa95e1e4c5fa4bcae14f3dcf2c0dfeed5964dbd5b5b92967074483e31e95d726e2e32f9fc0ab0ca5a1a5cb268f2e96a4f1ebae8b4acf3ad8fb3
+DIST gns3-server-2.2.39.tar.gz 9706605 BLAKE2B 813efad9c6832f41fd1135217ddb1fbd8ea0234a9f84bcbabde58e502e653785513e6b73b0cc2955fd0c0a65276c782eb70a444a243f6e7cba8022f848dbc213 SHA512 219fb595bf8c9032e0e2e8943a3164c6f1cbb1d443faeb089317ab58e69f73d64ce5efcf4ef8da4d26e61b32072145a638e2a657dfc8a70adc97c9d821745ddf
 EBUILD gns3-server-2.2.38-r1.ebuild 2073 BLAKE2B 5777e7dcbca4181ab824f7f9f41dcec37bb713657f57e43bfeaf8f3fbd74d1d8c7645ec12b068256ae140ef461e2077e0e21f2b4c7fae16fb757d1abc411c464 SHA512 f2f186839de1a6866369f3ff8c027a9ea6c4a8141a00923a2ef548d6ba2e941033f4f10c4ce748a91674866dc4904e66917fe20a685899831b6dc0abb8777c06
 EBUILD gns3-server-2.2.38.ebuild 2079 BLAKE2B e46367dcbb45b02b11508f74f22e607f6f5639663e8c843cd5d8a76a88fc62fe1163b3fcd1a60d4fcafb1e14451ec05c56fad285a1ef3364c9c8cdc7b3526c05 SHA512 18b79dcb6e722aa95e1e4c5fa4bcae14f3dcf2c0dfeed5964dbd5b5b92967074483e31e95d726e2e32f9fc0ab0ca5a1a5cb268f2e96a4f1ebae8b4acf3ad8fb3
+EBUILD gns3-server-2.2.39.ebuild 2073 BLAKE2B e6917dccae18416e7c2db6142f4b3a776b00c3e6d80e0f2956a69c841324d2bf01f1c946ca9d1d187b77b7c06993679bfbafa367e73d75847a3ad269a1fe0d24 SHA512 7030779a9d98163e8b60801815b952a5cad655294243c0e4ca598b03fa9ba852e042cac370bc0274bd944eebf32bd73d526643c3cfe6fd952d0f354c5c4ab8a4
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.37.ebuild b/net-misc/gns3-server/gns3-server-2.2.39.ebuild
index d399b6d9463f..f27410e66393 100644
--- a/net-misc/gns3-server/gns3-server-2.2.37.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.39.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_11 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature systemd
@@ -21,7 +21,7 @@ RDEPEND="
 	acct-user/gns3
 	app-emulation/dynamips
 	>=dev-python/aiofiles-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}]
 	net-misc/ubridge
 	sys-apps/busybox[static]
 "
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index b7e661b5edee..bac06b5e47a9 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -5,13 +5,7 @@ AUX ctxwebhelper.desktop 320 BLAKE2B 877ade9bf35ca53ca81315e7ab6e9854e35d2392ad3
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-23.2.0.10.tar.gz 165430863 BLAKE2B 92e3eb397691c938768c4893ebbbef48cccbaf120de40956f3883fff76ac770fe55f3e99b397634776626d76962a18a8ce0a4814f5b8a52f39a3910e4cc764ae SHA512 9eaff591e14df82a05d5c8aa4b1ec763495671a5b46476b0d722ec0893939be99d99cf820432f27293b5d8c482544397562f8ab5be210b648d278a73cc65fb0a
-DIST linuxx64-23.3.0.32.tar.gz 281196971 BLAKE2B bcdf0303ba9e354e6359b3b50f2cbd74381a4976cc80abf7caa40e4da764775a89c83a73454351bc31f2e20cfe823fb5efaa15d0554fbdb72d6aa298f5b9f590 SHA512 ab75d9c959613584e05fff629db8951cd9777480ba1dc52f78ef99ff376dc563075d137454c9f8dacdfcb497abc59bce0d7e72541a690ce8df891e50696bf830
 DIST linuxx64-23.5.0.58.tar.gz 449048746 BLAKE2B d0a70dbb29addc5da8f4ca32582eb210ef56cbbab21efa61ea19ae45ae12fcc59b080f0f30fdc5d1ed02169b5084a49ca265f7bfa9dde813809847f06b319046 SHA512 f695a4fed73b6bff30eb16f8c159799c7a7b4c17f088959f24c17fc4a51208c1354c19df1e22b9b975f8fcb13f6775ea1dca15dd149ea186d8aeee47f3830441
-DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a
-DIST linuxx86-23.3.0.32.tar.gz 239477961 BLAKE2B e0d4518ea99b95e67f94fd810c70da1509fe511c5248417925034b48f77a5a9088556d57904d73930daad2960622f22851bd4e3ed3cd6c1524b5c59bab83367c SHA512 948634578fcfefa36957fba2240c0ebf6ddc4288d3308dc0234f7d816a2b20e080bf6e3a688b105b4593fc1833dd3846cce30a561c364d6ed0a9495f8f03f7b0
 DIST linuxx86-23.5.0.58.tar.gz 152642143 BLAKE2B 8ea722aecfb7e6588701646ed5dec1d1591a8c36986fda25c85ece50313cd1eddefb22ae58be8f1ea2edbfdf9fa725e73182f0745b0494df890008d65065ed08 SHA512 8cad203451b26920d66fb3b1bb794d74f8ab76dd24d76408f51d60278786b59fe2d83f0e6c4a2eb6741a4e1d534b9739513224e0f27ba903a9266f81e439a51f
-EBUILD icaclient-23.2.0.10-r1.ebuild 6210 BLAKE2B 34ee22be79050c40c9bd00c85ba06dd9f7a13c6a03ed597f164fa0be42496ce74be4cb7e45282ccaabe64febae7d21d95855330f93142a3a501ee04c51f1bdeb SHA512 3ab0182bce2ce8a2e54c6501096d14cb210c05d4d3b1b3f576fa6b5824c895fb756b9acc585f11710a40aca101f791bfc80e0c4db9434b4b9b9d97d06da4d116
-EBUILD icaclient-23.3.0.32-r1.ebuild 7197 BLAKE2B 198710d768d134ea693667429770f8ae0b958e0e6ced631400bcf27b85bf197a2fa9b27455223db0f446d9d3ca8c1c08be2e42c5cf78e6cc05a89c70de222eb5 SHA512 181053fb871447a834b00a19c57b61f3f6fd9f4441ad5d0ed0e12eb373d817c204aa84fbfeb9ee2cdd4467978b93f4ccb6e33f79ef074640e981df9d565af3a3
 EBUILD icaclient-23.5.0.58.ebuild 7266 BLAKE2B e17e040a61bb53e95f81c7f206f553e01ca2888a8752efd512d11e673d166a875b57af29d5e02baf2aee35a12ce6a61c99b870b728011dbde26bd0faf8214f35 SHA512 b3b538c125466ddd9bf43bff93d83a544f47903aa905b6ef132fee37b996704adff1dbf41efee15c86f1c97682e6da97fd28fdfe577fa8cce9e078f1b57480a2
 MISC metadata.xml 564 BLAKE2B df856bf3af610f637dc7a12a52c92019112ec6adbd18a9762b8d0059169cf3de7d6b2377a7c3320c33b92915db83732a23104869f5e51c3e2c0e43a0cc19b436 SHA512 089cf367029e682e406034aa6d7a1b58fd656d63655fb6dd30c92b041a02fa5a093a77408c28bbaf156a3ccee9bdc2a5283908d51aab1d8494685854877aa5e6
diff --git a/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild b/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild
deleted file mode 100644
index 760b4ca1580f..000000000000
--- a/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx"
-RESTRICT="mirror strip fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-# we have binaries for two conflicting kerberos implementations
-# https://bugs.gentoo.org/792090
-# https://bugs.gentoo.org/775995
-REQUIRES_EXCLUDE="
-	libgssapi.so.3
-	libgssapi_krb5.so.2 libkrb5.so.3
-"
-# when using media-plugins/hdx-realtime-media-engine we better not ignore that
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	!hdx? ( libunwind.so.1 )
-"
-# we have binaries which wouls still support gstreamer:0.10
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	libgstapp-0.10.so.0
-	libgstbase-0.10.so.0
-	libgstinterfaces-0.10.so.0
-	libgstpbutils-0.10.so.0
-	libgstreamer-0.10.so.0
-"
-
-BDEPEND="
-	hdx? ( media-plugins/hdx-realtime-media-engine )
-"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libpulse
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/speex
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	sys-libs/libcxx
-	sys-libs/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-	${BDEPEND}
-	!hdx? ( !media-plugins/hdx-realtime-media-engine )
-"
-DEPENDS=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	cp nls/en/module.ini . || die
-	if use hdx; then
-		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die
-		mv new_module.ini module.ini || die
-	fi
-	mv module.ini config/ || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	doins config/*
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	cp -a util "${ED}/${ICAROOT}" || die
-	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-
-	insinto /usr/share/mime/packages
-	doins desktop/Citrix-mime_types.xml
-}
-
-pkg_preinst() {
-	# previous versions of the ebuild created that and left it around
-	# we own it now and avoid conflict warnings with this
-	rm -f "${ROOT}${ICAROOT}/config/module.ini"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! use hdx; then
-		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
-			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
-			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
-			ewarn "not need to be explicitly installed anymore."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild b/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild
deleted file mode 100644
index 67ffc799b202..000000000000
--- a/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb"
-RESTRICT="mirror strip fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-# we have binaries for two conflicting kerberos implementations
-# https://bugs.gentoo.org/792090
-# https://bugs.gentoo.org/775995
-REQUIRES_EXCLUDE="
-	libgssapi.so.3
-	libgssapi_krb5.so.2 libkrb5.so.3
-"
-# when using media-plugins/hdx-realtime-media-engine we better not ignore that
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	!hdx? ( libunwind.so.1 )
-"
-# we have binaries which wouls still support gstreamer:0.10
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	libgstapp-0.10.so.0
-	libgstbase-0.10.so.0
-	libgstinterfaces-0.10.so.0
-	libgstpbutils-0.10.so.0
-	libgstreamer-0.10.so.0
-"
-
-# video background blurring, optional
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	libopencv_core.so.407
-	libopencv_imgcodecs.so.407
-	libopencv_imgproc.so.407
-"
-
-BDEPEND="
-	hdx? ( media-plugins/hdx-realtime-media-engine )
-"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libpulse
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/speex
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	sys-libs/libcxx
-	sys-libs/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-	${BDEPEND}
-	!hdx? ( !media-plugins/hdx-realtime-media-engine )
-	usb? ( virtual/libudev )
-"
-DEPENDS=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	cp nls/en/module.ini . || die
-	if use usb; then
-		# inspired by debian usb support package postinst
-		sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die
-		sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || true
-		echo "[GenericUSB]" >> module.ini || true
-		echo "DriverName=VDGUSB.DLL" >> module.ini
-	fi
-
-	if use hdx; then
-		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die
-		mv new_module.ini module.ini || die
-	fi
-	mv module.ini config/ || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	keepdir /etc/icaclient
-
-	insinto "${ICAROOT}"
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-	if use usb; then
-		doexe usb/ctxusb usb/ctxusbd usb/ctx_usb_isactive
-		doins usb/*.DLL
-		insinto /etc/icaclient
-		doins usb/usb.conf
-		dosym ../../../etc/icaclient/usb.conf "${ICAROOT}"/usb.conf
-		insinto "${ICAROOT}"
-	fi
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"/config
-	doins config/*
-	mv "${ED}/${ICAROOT}"/config/module.ini "${ED}"/etc/icaclient/ || die
-	dosym ../../../../etc/icaclient/module.ini "${ICAROOT}"/config/module.ini
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	cp -a util "${ED}/${ICAROOT}" || die
-	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-
-	insinto /usr/share/mime/packages
-	doins desktop/Citrix-mime_types.xml
-}
-
-pkg_preinst() {
-	# previous versions of the ebuild created that and left it around
-	# we own it now and avoid conflict warnings with this
-	rm -f "${ROOT}${ICAROOT}/config/module.ini"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! use hdx; then
-		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
-			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
-			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
-			ewarn "not need to be explicitly installed anymore."
-		fi
-	fi
-
-	if use usb; then
-		einfo
-		einfo "Add users of ${CATEGORY}/${PN} to group 'usb' for redirect to work"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index c770bb5f6299..691702717b3a 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -1,6 +1,10 @@
 AUX rdnssd.conf 80 BLAKE2B 481e66d63c6743780fa2f887ba990e71050dbc92dfe5d4db7ca7715a8b19abe388f0ca92d3cab4eab4c6f72f5c941d06b9bb4d2f421e73ccd6a0a61fe9dd9df8 SHA512 b9a806b24e0d466efbb633eeab0169c289475a50eb3cc627853a4b28dc97136a42988fbea0d71d8b0afe2dfe955c5b96c300607d6abf7a254beba4cefd486a57
 AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b86364c501bd1e5eaccaf682f93ef38a4e18de4b2e955a98604bc5854054da5a31ef97cebde602 SHA512 0582ed315756d3e3c17d789252b3c68d1a7dfc6e74e600c0ea186775c976af447923cdc8182be23dd1418323503a91f8f82bc5068148a92bb40f9888a7c5cec2
+AUX rdnssd.rc-2 435 BLAKE2B ed2a4b1581267d3f7cf598ed0577c3e4284bcf48d7422da379c5b64cb551d13a791535bed2d28032c2c630331b2130e9ec3eba301ad8e41efff97090fcb6e94b SHA512 935e81c5e43819fe8b7c866aa1acf3fc73c7c096ce7a4f4b61d6a9039f7bb99f3dfd5fe32226f0e512512df1e315bf6d01043c9b82c72816cae243aa2a3acf3c
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
+AUX resolvconf-2 152 BLAKE2B 25319dfe7cc261cab4f6ed17daf4547ebc7a01207046227036d10d9bdab7806fbc0a89814231049b7f5efcaefb1e140b717f59a8919736286100f32cf6b9e672 SHA512 7f90892db25bd91d7b1d47ea029774b16b29155a092b4811195e942f11cfbbf42ec9b557c80171b4ee178b9a6d57fa1249d39d48b4f8b41790476819d5fa286c
 DIST ndisc6-1.0.6.tar.bz2 262008 BLAKE2B b451f8a6f74fe0d30546152e9711055cb2d9fd1433a83f0fdcc57eba4f9eaf41705b03fcfcc14666906f90f3a450c2ef6e3d66faca5019106664dd96dd6d70cf SHA512 e9ce26d139c5cdcaac7a507c247ace5ba1d6bc95a92fbdb693788e463183965390a8228133a8bbbf07ba19eeae64c7a12ce13eb031c1a0c0c47b086d42c527ae
+DIST ndisc6-1.0.7.tar.bz2 262144 BLAKE2B 6eeb4d8b78e189f1c2db26312b67d8a9ed4343fad0c9db08bfc8e7d4514f50b1b11c6ee5f784cc0480979758a0fae840e87b61bbbdf4c372fe58117cb8dfdab4 SHA512 cd3da7efc050b9f71a0d41336367c21936b37a2a040b58f01ccd5657a4cbd791b974bcd32e0725b325d9322974b0e721af9a6d9ef4693506e437c29a15d81526
 EBUILD ndisc6-1.0.6.ebuild 714 BLAKE2B e840b00321e55e1e17f47733b794d5c9230dd841f7bf7ed6dac53b94516156a61fcd6493c2acbc080d2d3bfb85a4f5bbc3f7e3b8f3a1cf575b3cf28baf77201e SHA512 926089fef328dbd1c2f9bca25a1315db968f7eb19551fad2f50a57eb9c98f800dc6b227fb25c95f48afd432853273acc0a06d13c0929ebf73a28bfa8a7622655
+EBUILD ndisc6-1.0.7.ebuild 781 BLAKE2B 5492486f0addebcadb9f0ba18aa5469a358f91bceab9243dcb8e343933e7c23ab5ade5c68c3c853f4c08b0af1a14d4e2bd74b82c159f11891dae525b263e6ec6 SHA512 70424f9bb1ed39b2a9388c0056818e0f27b081d533acf53617964c36caf9ae71dff3e296ac3c18cbc6a5c98a03866eb24f3cc71ad86c7351fbbae7f86c03f53e
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/ndisc6/files/rdnssd.rc-2 b/net-misc/ndisc6/files/rdnssd.rc-2
new file mode 100644
index 000000000000..a3a2a45a2d1f
--- /dev/null
+++ b/net-misc/ndisc6/files/rdnssd.rc-2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	before net
+	use logger
+}
+
+command="rdnssd"
+pidfile="/var/run/rdnssd.pid"
+command_args="${RDNSSD_OPTS}"
+command_args_foreground="-f"
+
+start_pre() {
+	checkpath -d -o nobody /var/run/rdnssd
+}
+
+stop_post() {
+	if command -v resolvconf >/dev/null; then
+		resolvconf -f -d rdnssd
+	fi
+}
diff --git a/net-misc/ndisc6/files/resolvconf-2 b/net-misc/ndisc6/files/resolvconf-2
new file mode 100644
index 000000000000..79d69c60e7ad
--- /dev/null
+++ b/net-misc/ndisc6/files/resolvconf-2
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if command -v resolvconf >/dev/null; then
+	exec resolvconf -a rdnssd </var/run/rdnssd/resolv.conf
+else
+	exec "$(dirname "$0")"/merge-hook
+fi
diff --git a/net-misc/ndisc6/ndisc6-1.0.7.ebuild b/net-misc/ndisc6/ndisc6-1.0.7.ebuild
new file mode 100644
index 000000000000..d0d3a2b1bbd4
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-1.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="IPv6 diagnostic tools"
+HOMEPAGE="https://www.remlab.net/ndisc6/"
+SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~x64-macos"
+IUSE="debug"
+
+BDEPEND="dev-lang/perl
+	sys-devel/gettext"
+
+src_configure() {
+	local args=(
+		--localstatedir="${EPREFIX}"/var
+		$(use_enable debug assert)
+	)
+	econf "${args[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -r "${ED}/var" || die
+
+	newinitd "${FILESDIR}"/rdnssd.rc-2 rdnssd
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd
+
+	exeinto /etc/rdnssd
+	newexe "${FILESDIR}"/resolvconf-2 resolvconf
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index bea8161de757..f21f5969525b 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,6 +4,6 @@ AUX rdesktop-1.9.0-configure-clang16.patch 897 BLAKE2B fa1fc01810a466ed855c1c7b3
 AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f9bf867d1890a16a027015390c8402f9da98513ec5fa5fdc2fee754d4e6c436cfd20d61cf830e3f9a8d7111bac37cbeed06 SHA512 85308d3230fa71a2381f35c20c02e3316a8b1b98bbe3f507d9f14fc8f7e703ffd7a6a45907e0799d3f7a243da52571e3c07b7adb1f68a4123133d8ea3eb31451
 AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
-EBUILD rdesktop-1.9.0-r3.ebuild 1811 BLAKE2B 23bb0d48d59ffe2db3a524ae4faa10a84db6ac2a569e5c4187efb9077df1a8b20e9c5de96b24b3dcc0be9dcacff7806eead737a777100de885b5a7a6551d73fd SHA512 148f7849d71c38891d0c8b42be8415617f634a96eac2dfd05c548adb6429677251ec87b5e9010605009a4dbc35faf982ba3dd96010bc3b5d521483ea60c2191f
+EBUILD rdesktop-1.9.0-r4.ebuild 1792 BLAKE2B a03ee4506947ba0b7d05ff8da79c77c4626a75f0ce14bdc57c22cb91559f2980ade01bee0c0be37bbc06683404373c4fe34e449480231cc0bd1b58f4efbb984b SHA512 9f567aefab1bff9366dc38162e58ac6fa3a84a46951bdf5c3b403a190f8d2ab41e42c1577a8c53cdea5b65aa979c779a7c9c0227f386eeda6571c50197ef9f88
 EBUILD rdesktop-1.9.0.ebuild 1666 BLAKE2B b99ffca0fa03a63b1ddf862944a1480af3bf45779183b00ef8709c466080224386603e571aab195fd93be725ae89cbef41cae2933fa8bbba12a4f08719bf69ba SHA512 804c6a486dc957871cf1644b991f3001e3f1e14e3e55161c4c4d289b7c908cdbd077fec11491b529673712ada7db32007e009b682a3fd3336e3bc0a1b33600a5
 MISC metadata.xml 941 BLAKE2B 966b0157d9829250ad1c8e31ddba5033d48ce9fa7991b380ac62f085d28ab1d5a8359b0f085fdb2cc6eb4f449fb1eaabfc2007852b33935104287d3ede542642 SHA512 6fcf246ef6bd5379935099046d6a760f339714ce05ed78aaf92d4c0467fcca29e4580d19e2fb168916251d936f94d34cfd3a86734f2b45028f0dc4f441d3bf4e
diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild
index b6f11463cc8c..7d9cffc8104a 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools
+EAPI=8
 
-MY_PV=${PV/_/-}
+inherit autotools
 
 DESCRIPTION="A Remote Desktop Protocol Client"
 HOMEPAGE="http://www.rdesktop.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${PV/_/-}
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 RDEPEND="
 	dev-libs/nettle:0=
 	>=net-libs/gnutls-3.2.0:0=
@@ -37,8 +35,8 @@ RDEPEND="
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
 	oss? ( media-libs/libsamplerate )
 	pulseaudio? (
+		media-libs/libpulse
 		media-libs/libsamplerate
-		media-sound/pulseaudio
 	)
 	xrandr? ( x11-libs/libXrandr )"
 DEPEND="${RDEPEND}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index fe6ed2a93ff3..6bd8403bb497 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-3.1.7.tar.xz 3235528 BLAKE2B 3632c531e016d15c1afec15a65e2abffa3f16698404041e019ced97b97ae748d56f2bc400bc8589c709e40bb4ea133370e7713a44ffe9a1ebab2b8096713ddae SHA512 3215ef8b97af11b8ee88a82bab4c6e1821a735ae846c2935a05a94b145e0dd4114fa3fc5ae34c84ea2494a31efee0ed8418acb027eedf1c81920a9e9d579f50a
 DIST smb4k-3.2.1.tar.xz 4311100 BLAKE2B ebbb95faed9a1550171c49f79986daae14d31c0c4dcd9756a99295a296c49a06e5c8515643973a9567acab6a7f664bc18a8f84c0398af2275f92ee91a17745f2 SHA512 36b1d0d46fc51274a0b4ca780cb8413972e675aaabf7177c60c82c22b5d03b49eff8a233f0c9f141e7566b1148192bbdcd67c1d2bf9bd25c43fbe7b3b2ea1878
-EBUILD smb4k-3.1.7.ebuild 2049 BLAKE2B 0cebd78cb4f08b890601933f1b95ea77d4d6ea5ad957ca15efe24506ef11ac165c7b906445c794a0a600cae2843fb0f2b23d27d524d97c330e68d2e2a4d9766e SHA512 87e40d2701546951691dcf828cab052487dc384678c3b64a85b3f339c1a9ea02d50726689a25f8498c82202c5783715bb32c1a4df484b8b532601c564866d4ee
-EBUILD smb4k-3.2.1.ebuild 2023 BLAKE2B 28f2e7fb4655b6e634be4734453935c0e2d942fdc1cb71c4abee93bf9750ea01846d40c7ed01c400c0355c9fa5c92700216cc3a9931407bed996bbb4b58ab5fb SHA512 c51a1c08d59b1f66ef2b54599b838d19b1b130755abedc8bda3875bffa839d40571135f64a7d7f9577df7830344f004e477106c813837a8ea13dcdddc72c0f22
+EBUILD smb4k-3.2.1.ebuild 2021 BLAKE2B a539529b7cd2917d7ee9357ab4a4fe21dc38206a49f833722e736196d26393c2af5747c77cbc1af7a0d87b6ffa27cba90ab46a17fa8581925600cfbe66e62c96 SHA512 78431d96e06d86329566f7fa2e0ecab1c390c957ab02d3a319c60cdd459c4b0a0d6adadf4bc48c3e54d438c4b470b8151c279835f0aabce95decfb0ea8c70ded
 MISC metadata.xml 536 BLAKE2B a63d5147b710ea87007fdc6f5a925fc25304ee2efb9d4d35908be6f14c9dec6fa9e911b4ab9e5becc79c39b6e9440692cc8c16491d27dec16f693d965faa0366 SHA512 c317c3d5d1c2e04f2fcdd8da869cbff861be73106cedd982b0cd7a881f679e9bbb5cd9fce1dccd66d48388f670b1cda8bc78e53496b1f55fd8c634ee8ceb88e6
diff --git a/net-misc/smb4k/smb4k-3.1.7.ebuild b/net-misc/smb4k/smb4k-3.1.7.ebuild
deleted file mode 100644
index 759d7cc72450..000000000000
--- a/net-misc/smb4k/smb4k-3.1.7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+discovery plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-	discovery? (
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
-	)
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
-		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.2.1.ebuild b/net-misc/smb4k/smb4k-3.2.1.ebuild
index d52805fd7b61..9bc0d299524f 100644
--- a/net-misc/smb4k/smb4k-3.2.1.ebuild
+++ b/net-misc/smb4k/smb4k-3.2.1.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"