14 files changed, 355 insertions, 467 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4d32288b2553..027d9b3783c2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 4e3391a46bca..4a3467636356 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,12 +3,10 @@ AUX dropbear-2022.82-tests.patch 820 BLAKE2B 8b8d7bbc80962fd4be56078d54c12097bd6
 AUX dropbear-2022.82-x11.patch 636 BLAKE2B 89e95851d9f184d215f1e6ffd972f9519be8ef0c153d49306c3fe09b97c8e3ae4b8c1705c0f1532681c4d5e49f17f6f85f8c75667f2340d3cdd1a1e52a9795cf SHA512 ceacd4776d3c7b4c830bdded66e61b77c8e267fdcc0f0b42fd0ad4981610bdcfca98e2dc14c48eac5681035f2e7f0644553dfb419424d1536bf4f7b81e577f6c
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
-DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
 DIST dropbear-2022.82.tar.bz2 2309514 BLAKE2B 56ff931de1e5681850a4c96b8f2c1d90db1680a08a8a741ae3034a433c2780715ede9754357477c9adfe35a310859641d7a03534e6a656e11cd7de8832fbc27d SHA512 94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b
 DIST dropbear-2022.82.tar.bz2.asc 833 BLAKE2B 7d152456f24a61add2935e7f2c9ae7a05e00137ae2c39638004cccc1fd0491311328b5e829443cbe727ae6ec9d58973270b917bae0f23ddcef0b5051b62ca60b SHA512 a45fa49857598195b8d7e51e02bf26498a74c6900245c114ce1fa19bc4eb0ef0518cbb68996c3584c0b98c22bb2078eb963e4a513f0dfb03baae6d04f5911105
 DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
 DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad
-EBUILD dropbear-2020.81-r3.ebuild 3009 BLAKE2B c85c3b010afa5aa31cad91e362385a38d7e39467d2b6b0353898eb603e3624da7b520c79512c3ae87b100445d4470eac16b762391589a2e4091de2a92767285e SHA512 bfb2f428fa98bb9accb282c18cb13378970362705f74a04711604dbe8ad9c25619f2b96d6e5df4060a9b556d04ea7fc7d695a1741481d541cc6032b131fbdfeb
 EBUILD dropbear-2022.82.ebuild 4489 BLAKE2B d0ca38f8dfd5902126ea88fbc772c3d6e255830ba4f3b2bb5da23b4d05f19c760ced8127561da3df743ea715c3154d1c2857679dc3f1d07d7c0b91e98f11161b SHA512 3a9a2faa99a8af452ec1a806bbaea4585ee5e3b80f690a13f0eed9ce68cba59c45a8f0b287f5faddb60211d86120313a5f9286f0fa231a9abf4e719d888a8e86
-EBUILD dropbear-2022.83.ebuild 4454 BLAKE2B 442c3ae978a0af6aec522987b931307bd721c80f88c1f1b5e90030d8f1fce088333b394c3c9d005908c6113e3bb0b1ebc4ac3d4fa9a7f181731044c58971f53c SHA512 e8ae254faf0c9c83d61b98e3a7115361eb7356afa36b1a83991c0ffcff1bbec1af01a8c12bdaf6a880bcb6df70bb02041c8dc86a7c9eafae6304c83970d1c4b4
+EBUILD dropbear-2022.83.ebuild 4452 BLAKE2B 388e446d1224bf2f54b940c7d9174ba79eb677941afed620a6e3f8492a8ff9e4e80c241cd92d5ff75ac9de9d985d4fc09e47682d80ae1fd683e1f20f0fe4aaa4 SHA512 0677d436220d5bc73c1583059b1c443e6624102b2cbaedb83d377a38e29f55782f0e6140a98c95a36cc4b6fd0188d27b95e137870873c78acd83b05fcefb122b
 MISC metadata.xml 1814 BLAKE2B 77ddfd966cd18b81304eb8f43cccaecf1ee223896a5cbba75d3ec7140b9ee871ff83a3d7a938198f8fe29df4b30f61d2bb7d9a5058018ec4694f53667c7e83f7 SHA512 ed7051343a78900724eb077cc985d68d614902e2edc01e014d2b685158f143c67fee863599f0a40f318bed9dea81091d756e15d07e1e20ff1e9961b2f4e0f34e
diff --git a/net-misc/dropbear/dropbear-2020.81-r3.ebuild b/net-misc/dropbear/dropbear-2020.81-r3.ebuild
deleted file mode 100644
index 15ac003888ba..000000000000
--- a/net-misc/dropbear/dropbear-2020.81-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig pam
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
-
-LIB_DEPEND="
-	virtual/libcrypt[static-libs(+)]
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? (
-		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
-		>=dev-libs/libtommath-1.2.0
-		${LIB_DEPEND//\[static-libs(+)]}
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.46-dbscp.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-pkg_setup() {
-	if use static ; then
-		ewarn "Using bundled copies of libtommath and libtomcrypt"
-	fi
-}
-
-src_prepare() {
-	default
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i svr-authpam.c || die
-	restore_config localoptions.h
-}
-
-src_configure() {
-	# Notes:
-	# 1) We use bundled libtom* when static build is enabled because
-	#    libtomcrypt lacks it and we don't particularly want to add it.
-	# 2) We disable the hardening flags as our compiler already enables them
-	#    by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-		$(use_enable static bundled-libtom)
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}" || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/dropbear-2022.83.ebuild b/net-misc/dropbear/dropbear-2022.83.ebuild
index 0ede69cedbbe..d4c0bb904006 100644
--- a/net-misc/dropbear/dropbear-2022.83.ebuild
+++ b/net-misc/dropbear/dropbear-2022.83.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
 RESTRICT="!test? ( test ) test"
 
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 7fca6464bd9c..a4e3ec7a59fe 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -7,8 +7,11 @@ AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-22.12.0.12.tar.gz 165269811 BLAKE2B 7735357f38d9438137792fc1d1febfdda6ca464fc43f573dffb4a33fffca052a78b8b61277cffd9287efcbc3823529e707140e7c9c1f9502c768528d2018b71d SHA512 bbe002d32e6d3819ab76ecef7fe7b62fff14da409d1b13c6edfc947cd46b0919d0f1972e7c1581d871bbe341ea50d3cf0da797f53f97b8e370610b37048f9a31
 DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
+DIST linuxx64-23.2.0.10.tar.gz 165430863 BLAKE2B 92e3eb397691c938768c4893ebbbef48cccbaf120de40956f3883fff76ac770fe55f3e99b397634776626d76962a18a8ce0a4814f5b8a52f39a3910e4cc764ae SHA512 9eaff591e14df82a05d5c8aa4b1ec763495671a5b46476b0d722ec0893939be99d99cf820432f27293b5d8c482544397562f8ab5be210b648d278a73cc65fb0a
 DIST linuxx86-22.12.0.12.tar.gz 147837116 BLAKE2B d5f1c53d1f2d2ecb95e67df256a667df733251a99dd4a5e9584554521c4f1b1fbd065dfd8b1c4ba344a543c5cd7dde4a939e3d4d82f658e7dae42c07527b645e SHA512 8e9c4262dcd7731b88ae43a663d5901a21a9ede2feed163b538f5fb475f0eba8768a08715db5e9c8fa809442140d1ef03d4d4e509cb83142bea806855615a6b3
 DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
+DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a
 EBUILD icaclient-22.12.0.12-r1.ebuild 6243 BLAKE2B d2e67395e6b06d1b6fecfe520fbed706f3c756196589b9718099f22ac548e58fc22aa143123290472e32595808e0a123faba15f105efd06086230e2a70e35a9f SHA512 101f52262ff7bb543f49c5996ca1ae79febc41eb0df78bf1720fa3cfe9ee53aa37e38af172e83a388297b32438132dd640d1a99ed123cf110a22c42eeb31a080
 EBUILD icaclient-22.5.0.16-r1.ebuild 5600 BLAKE2B 4b79fe220715ff4464987a286e20cf7f22c69738a3e53e70deb92d77311181737e0767dbe6f3afe1c01ca33c8cd9ef0c47cc94cc5863d6f2611a49232d53871a SHA512 7148dce99640ca9fb715b5d7663af594502f29e16fd509f778b0460ff2f4e53673524b19642858923f3e079b7fbc76b4d71c176e77f1f1a824f0b920306a05e8
+EBUILD icaclient-23.2.0.10.ebuild 6245 BLAKE2B 5b1bfa3a82fc51fd076d8eb4eb55a5f2033c1bf219cefbbcc2121d050c27318e6b00aca682ae0b284b0d1ce2de212c58be9c1cde7d9f65477b691d163d5781c6 SHA512 c96700c3b0efbc1d1db62d2891ae31cea36765b61bf8dafc3e5263686cf2cf39b6633a3753e382b832a00e7255f3b1cafe9c6de3b110662571db30ba448931a6
 MISC metadata.xml 489 BLAKE2B 5277ab65457a889a26aa1c77279d68eef6fd4bd8d602e0ca1a06fac51b5576ce4b7d976bbbaeea555fc6ba2be42d686cfb425b03088bd5dff789edafbf11bb5c SHA512 4c69d7956c48402fa1fac2c5adede5079f8daf7c07a04f4d05af185dfa0d13417d54ce0ec063c77f966814e057f732c995e9e26e896e3c55a20d7c71db62f82f
diff --git a/net-misc/icaclient/icaclient-23.2.0.10.ebuild b/net-misc/icaclient/icaclient-23.2.0.10.ebuild
new file mode 100644
index 000000000000..5fe81dd431fe
--- /dev/null
+++ b/net-misc/icaclient/icaclient-23.2.0.10.ebuild
@@ -0,0 +1,276 @@
+# 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-2.9.500.2802-r1 )
+"
+
+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-2.9.500.2802-r1 )
+"
+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/remmina/Manifest b/net-misc/remmina/Manifest
index a76256553585..68e2d26adbdd 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,3 @@
-DIST Remmina-v1.4.27.tar.bz2 1975470 BLAKE2B 09ce4cd29f476a307dce4c35d8304b8383db016b63646375d50a86051f6dd99fb4775700e3d8887dbbbece72b90dcbc5987b0705e2fe8f5b0840bba1cb29c92e SHA512 44bc067eaf2c4c10e42182aa7c3ec2aa18ec5c0ce51a2fc765884cbfc11261d3c0db537b1674424aa092caf171e647714dcc8af6d813273f7b96876a251e0575
 DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
-EBUILD remmina-1.4.27.ebuild 2702 BLAKE2B c481ef70b489d8d35fcc94baba872cdfa21b1111ad853bf15a5928ab4d35da724aafd968803ef824cd13736d523973fa1db0bc01ed6c0d85168c82f149d40293 SHA512 454453b963eeeeb1be58aac6db22ad4909672b0d1ab238cd911e101aeb5883776ab609951422345b2ae4b7b9691a90209e07505c195ce6619f01baf91fa55ecb
-EBUILD remmina-1.4.29-r1.ebuild 2706 BLAKE2B dd15edd37d77276438e44bfd08895d9bf30ac2aead365d0e7a7556b0bb83a86ee8c38fc1c3bdc32f9f962fc58209b3239eb6688e4e7b7fc3b4b3fbb3c16dca0c SHA512 b46a5027b4a0eea624e8a5206746fa2bcdde075184d81b90c56220886cf6d2f53f453f81981c7f9f41b5a7788ece6e3e0e1f13f4efac46956e9b11c3c2b0b175
 EBUILD remmina-1.4.29-r2.ebuild 2664 BLAKE2B 58e38dfd0d870f1e6b0fd2701c8ab09f9cb6af5c65ada4bfe5cf913f7fe306386df823b6b559384a9c7ee9e23fd08f16923a9c8583d141c11d9b8f6d45dde2b0 SHA512 a072a1499c8e1aa3a0c544fb2163ab7cc5609cefe982c6f2b81f59d8e9fbcaa33cda1978c493d8c8625b4a90efee4ecc1a06e9db1ee1958505144dee3100b232
-EBUILD remmina-1.4.29.ebuild 2700 BLAKE2B 0189ecd073daab151c4dd42e0d7c4edafeeead44e2c8fd17f3bc26dfc6dd38e828463bd4d5a6c738be31f463c8620373f00ad290d9e0b7c228910672e1ca5b75 SHA512 dd26f3906654ad7c822e9282249172713da221a4abe3d694b7a04e322a1700539558248a8e70fc049a31d2e6ddcbee4b8b3045892c04d849cbe2bf7c16f2a727
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.27.ebuild b/net-misc/remmina/remmina-1.4.27.ebuild
deleted file mode 100644
index 893bfcc13437..000000000000
--- a/net-misc/remmina/remmina-1.4.27.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	net-libs/libsoup:2.4
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.29-r1.ebuild b/net-misc/remmina/remmina-1.4.29-r1.ebuild
deleted file mode 100644
index 901a4cac14ff..000000000000
--- a/net-misc/remmina/remmina-1.4.29-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libayatana-appindicator )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.29.ebuild b/net-misc/remmina/remmina-1.4.29.ebuild
deleted file mode 100644
index c86d19979b6a..000000000000
--- a/net-misc/remmina/remmina-1.4.29.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index ee6ffd47a929..0f6deee7c051 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,4 @@
 EBUILD tigervnc-xorg-module-1.12.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
 EBUILD tigervnc-xorg-module-1.13.0.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
+EBUILD tigervnc-xorg-module-1.13.1.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
 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
new file mode 100644
index 000000000000..aa3265514938
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -0,0 +1,18 @@
+# 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/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index c10b95aa3ea7..6d956b383c42 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,5 +1,7 @@
 DIST ytfzf-2.5.3.tar.gz 3265442 BLAKE2B e920bf60a567741cc84739d20f282c27036eafaa823ea273439e49f9b855798a11f611ee8b4893490538d24c3039f2780451272f82ead73c45fb0f2124e05417 SHA512 fcc9e6064fe381972f30a94fd418ba9a497fed4be891f40b75e608a4c095f7b311000ae104d8e877b52622defa4ff57cb0ec1ace4d034ba08f0ff3985438d58d
 DIST ytfzf-2.5.4.tar.gz 3273455 BLAKE2B 9e4ba90cca7a17fc8c7283097db1925582b9dbb85b9b83db77f2e20a48db7566a8396114256bcb61bffb281ac0ce64f199702f495cd07f2e4e11d0c81605a973 SHA512 48ab12314a638d2682eb387c1d0bd2c8979762287194d897d801c1b845c28e3e6c2b383e1fede75e0b0649ab401855e6a9ee48a58cfc4e08b0f291da877ed150
+DIST ytfzf-2.5.5.tar.gz 3278740 BLAKE2B e80ee83cbd80fd3d53dd4e3f9aca4fed71b6bbebc6b0f0d8c85263efa4dfd184e45998719df966279365378669624119035f069c4d2b2d5f820e5304bd36604d SHA512 811fbc1de1b23bddd988c74212f0d6b314e5a7998ebc06e0481d42a5e6afa530f10a0e749a293a76799eff1fc380ebd54210f5e152c6d8ab07fd39327544c9d7
 EBUILD ytfzf-2.5.3.ebuild 1428 BLAKE2B e2eddcee03517c5a01ceac852c4e4945f3da15d3fcb96f9fa028dafd4a0d52884e5b19e1ed0660ad49d4155b4171b88f731e16599ef26ff1f4c582ed77bb7992 SHA512 07d64edc61bb5ecd11ea4f88622da466999f353fb0b25cd86a3c9cd386739ec61e9f641ad082cb8113f4fd555a8e7d00347516f5153925173027ca6821ccff3a
 EBUILD ytfzf-2.5.4.ebuild 1511 BLAKE2B 8a2c8ddbaf4762d38b14d5a2b2dc7e06746eaed5432ca725b6e935e30301c644402e7079dd816cc5bc1d8d23d836592c40583c6b98b7618b774f3fd4240e1b9a SHA512 a9b90c9be7305e8bbd24933d76b627b11619af72ac50104737f444ec0014ec11f191bc8e626ac56c742d8e9b501b8cfdb1572d7835cbceb08f84b98328c1941c
+EBUILD ytfzf-2.5.5.ebuild 1319 BLAKE2B 9ef0c02ac618ba80a17f759ff82269867e22bdae2478d20ab5b5696eff08b0d63abae6c69c444a5eda5e9d51e12d2e33b31a1239c018fcf967fedb840a99e663 SHA512 c6e301cf49d3ffdd6f07a56d0e6b1a889365036bce441d526956213c831bd466d326ae20766cad8c5f5c8954769d60a4e7695a89b3e9aeb0d236e645049d7ee1
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.5.5.ebuild b/net-misc/ytfzf/ytfzf-2.5.5.ebuild
new file mode 100644
index 000000000000..28d4e09cb02b
--- /dev/null
+++ b/net-misc/ytfzf/ytfzf-2.5.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
+HOMEPAGE="https://github.com/pystardust/ytfzf/"
+SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X minimal"
+
+RDEPEND="
+	app-misc/jq
+	net-misc/curl[ssl]
+	app-alternatives/awk
+	!minimal? (
+		X? ( media-gfx/ueberzug )
+		app-shells/fzf
+		media-video/mpv[lua]
+		net-misc/yt-dlp
+	)"
+
+src_compile() { :; }
+
+src_install() {
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	emake "${emakeargs[@]}" addons doc install
+	einstalldocs
+
+	rm -r "${ED}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	optfeature "external menu support" x11-misc/dmenu
+	optfeature "desktop notifications" x11-libs/libnotify
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that ${PN} supports many methods to display menus/thumbnails."
+		elog "This ebuild primarily covers defaults and major features, additional"
+		elog "dependencies may be needed for others. Set USE=minimal if want full"
+		elog "control over optional dependencies (e.g. fzf is optional if use dmenu)."
+	fi
+}